summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJochen Dolze <vdr@dolze.de>2010-06-20 10:53:19 (GMT)
committerJochen Dolze <vdr@dolze.de>2010-06-20 10:53:19 (GMT)
commit003a000c7bcf7758443fd68baee09342b5744c3c (patch)
tree83d93b6267710c9a52eb95add09fdce62551c43c
parente8891a0d2713d830c276c3914a6c6bfd75b71295 (diff)
downloadvdr-plugin-infosatepg-003a000c7bcf7758443fd68baee09342b5744c3c.tar.gz
vdr-plugin-infosatepg-003a000c7bcf7758443fd68baee09342b5744c3c.tar.bz2
New version 0.0.11v0.0.11
-rw-r--r--HISTORY4
-rw-r--r--global.cpp12
-rw-r--r--infosatepg.cpp86
-rw-r--r--infosatepg.h2
4 files changed, 56 insertions, 48 deletions
diff --git a/HISTORY b/HISTORY
index 6c9f7d2..3f7e450 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,5 +1,9 @@
VDR Plugin 'infosatepg' Revision History
----------------------------------------
+2010-06-06: Version 0.0.11
+
+- Added support for VDR >= 1.7.14
+
2009-12-22: Version 0.0.10
- Changed wakeup and reset of received data
diff --git a/global.cpp b/global.cpp
index 2a3a681..05bec18 100644
--- a/global.cpp
+++ b/global.cpp
@@ -475,9 +475,9 @@ bool cGlobalInfosatepg::FindReceiverChannel()
#if VDRVERSNUM < 10713
if (chan->Polarization()!=Polarization) continue;
#else
- char *polarization=strpbrk(chan->Parameters(),"HVLRhvlr");
+ const char *polarization=strpbrk(chan->Parameters(),"HVLRhvlr");
if (!polarization) continue;
- if (*polarization!=Polarization) continue;
+ if (toupper(*polarization)!=toupper(Polarization)) continue;
#endif
channel=i;
return true;
@@ -496,9 +496,9 @@ bool cGlobalInfosatepg::FindReceiverChannel()
#if VDRVERSNUM < 10713
if (chan->Polarization()!=Polarization) continue;
#else
- char *polarization=strpbrk(chan->Parameters(),"HVLRhvlr");
+ const char *polarization=strpbrk(chan->Parameters(),"HVLRhvlr");
if (!polarization) continue;
- if (*polarization!=Polarization) continue;
+ if (toupper(*polarization)!=toupper(Polarization)) continue;
#endif
channel=i;
return true;
@@ -517,9 +517,9 @@ bool cGlobalInfosatepg::FindReceiverChannel()
#if VDRVERSNUM < 10713
if (chan->Polarization()!=Polarization) continue;
#else
- char *polarization=strpbrk(chan->Parameters(),"HVLRhvlr");
+ const char *polarization=strpbrk(chan->Parameters(),"HVLRhvlr");
if (!polarization) continue;
- if (*polarization!=Polarization) continue;
+ if (toupper(*polarization)!=toupper(Polarization)) continue;
#endif
channel=i;
return true;
diff --git a/infosatepg.cpp b/infosatepg.cpp
index bf8fcb4..07a1aea 100644
--- a/infosatepg.cpp
+++ b/infosatepg.cpp
@@ -18,6 +18,10 @@
#include "setup.h"
#include "process.h"
+#define UNUSED(v) UNUSED_ ## v __attribute__((unused))
+
+extern char *strcatrealloc(char *dest, const char *src);
+
// --- cPluginInfosatepg
cPluginInfosatepg::cPluginInfosatepg(void)
{
@@ -52,7 +56,7 @@ bool cPluginInfosatepg::ProcessArgs(int argc, char *argv[])
{
{ "dir", required_argument, NULL, 'd'
},
- { NULL }
+ { 0,0,0,0 }
};
int c;
@@ -310,7 +314,7 @@ bool cPluginInfosatepg::SetupParse(const char *Name, const char *Value)
return true;
}
-bool cPluginInfosatepg::Service(const char *Id, void *Data)
+bool cPluginInfosatepg::Service(const char *UNUSED(Id), void *UNUSED(Data))
{
// Handle custom service requests from other plugins
return false;
@@ -334,91 +338,91 @@ const char **cPluginInfosatepg::SVDRPHelpPages(void)
return HelpPages;
}
-cString cPluginInfosatepg::SVDRPCommand(const char *Command, const char *Option, int &ReplyCode)
+cString cPluginInfosatepg::SVDRPCommand(const char *Command, const char *UNUSED(Option),
+ int &UNUSED(ReplyCode))
{
// Process SVDRP commands
- char *output=NULL;
+ cString output;
if (!strcasecmp(Command,"RESR"))
{
global->ResetReceivedAll();
pmac=EPG_FIRST_DAY_MAC;
- asprintf(&output,"Restarted receiver\n");
+ output="Restarted receiver\n";
}
if (!strcasecmp(Command,"REPR"))
{
global->ResetProcessed();
pmac=EPG_FIRST_DAY_MAC;
- asprintf(&output,"Reprocess files\n");
+ output="Reprocess files\n";
}
if (!strcasecmp(Command,"SAVE"))
{
global->Save();
- asprintf(&output,"State saved\n");
+ output="State saved\n";
}
+
if (!strcasecmp(Command,"STAT"))
{
int day,month;
- asprintf(&output,"InfosatEPG state:\n");
- asprintf(&output,"%s Switched: %s",output,global->Switched() ? "yes" : "no");
+ cString head=cString::sprintf("InfosatEPG state:\n Switched: %s",global->Switched() ? "yes" : "no");
+ cString lcc;
if (global->LastCurrentChannel!=-1)
{
- asprintf(&output,"%s Switchback to: %i\n", output, global->LastCurrentChannel);
+ lcc=cString::sprintf(" Switchback to: %i\n", global->LastCurrentChannel);
}
else
{
- asprintf(&output,"%s Switchback to: unset\n",output);
+ lcc=" Switchback to: unset\n";
}
+ cString rall;
if (global->ReceivedAll(&day,&month))
- asprintf(&output,"%s Received all: yes (%02i.%02i.)",output,day,month);
+ rall=cString::sprintf(" Received all: yes (%02i.%02i.)",day,month);
else
- asprintf(&output,"%s Received all: no",output);
- asprintf(&output,"%s Processed all: %s",output,global->ProcessedAll() ? "yes" : "no");
- asprintf(&output,"%s\n",output);
+ rall=" Received all: no";
- asprintf(&output,"%s Prevent shutdown until ready: %s",
- output,global->NoDeferredShutdown ? "no" : "yes");
- asprintf(&output,"%s\n",output);
+ cString pall;
+ pall=cString::sprintf(" Processed all: %s\n Prevent shutdown until ready: %s\n",
+ global->ProcessedAll() ? "yes" : "no",
+ global->NoDeferredShutdown ? "no" : "yes");
+ cString wut;
if (global->WakeupTime()!=-1)
{
time_t wakeup = global->WakeupTime();
- asprintf(&output,"%s WakeupTime: %s ", output,ctime(&wakeup));
- if (global->NoWakeup) asprintf(&output,"%s (blocked) ",output);
+ wut=cString::sprintf(" WakeupTime: %s %s",ctime(&wakeup),global->NoWakeup ? "(blocked)" : "");
}
else
{
- asprintf(&output,"%s WakeupTime: unset\n", output);
+ wut="%s WakeupTime: unset\n";
}
- asprintf(&output,"%s\n",output);
- asprintf(&output,"%s | | missed | | | unlocated\n",output);
- asprintf(&output,"%s Day | Date | Packets | Received %% | Processed | Events\n",output);
- asprintf(&output,"%s------+--------+---------+------------+------------+----------\n",output);
+ cString head2;
+ head2="\n" \
+ " | | missed | | | unlocated\n" \
+ " Day | Date | Packets | Received %% | Processed | Events\n" \
+ "------+--------+---------+------------+------------+----------\n";
+ cString mstr;
+ char *fmstr=NULL;
for (int mac=EPG_FIRST_DAY_MAC; mac<=EPG_LAST_DAY_MAC; mac++)
{
- if (global->ActualMac==mac)
- {
- asprintf(&output,"%s*",output);
- }
- else
- {
- asprintf(&output,"%s ",output);
- }
-
- asprintf(&output,"%s %i | %02i.%02i. | %3i | %3i | %s | %3i\n",
- output,mac,global->Infosatdata[mac].Day(),
- global->Infosatdata[mac].Month(),
- global->Infosatdata[mac].Missed(),
- global->Infosatdata[mac].ReceivedPercent(),
- global->Infosatdata[mac].Processed ? "yes" : " no",
- global->Infosatdata[mac].Unlocated);
+ mstr=cString::sprintf("%c %i | %02i.%02i. | %3i | %3i | %s | %3i\n",
+ (global->ActualMac==mac) ? '*' : ' ',
+ mac,global->Infosatdata[mac].Day(),
+ global->Infosatdata[mac].Month(),
+ global->Infosatdata[mac].Missed(),
+ global->Infosatdata[mac].ReceivedPercent(),
+ global->Infosatdata[mac].Processed ? "yes" : " no",
+ global->Infosatdata[mac].Unlocated);
+ fmstr=strcatrealloc(fmstr,mstr);
}
+ output=cString::sprintf("%s%s%s%s%s%s%s",*head,*lcc,*rall,*pall,*wut,*head2,fmstr);
}
+
return output;
}
diff --git a/infosatepg.h b/infosatepg.h
index efed463..ae6b0c0 100644
--- a/infosatepg.h
+++ b/infosatepg.h
@@ -13,7 +13,7 @@
#include "status.h"
#include "process.h"
-static const char *VERSION = "0.0.10";
+static const char *VERSION = "0.0.11";
static const char *DESCRIPTION = trNOOP("Read EPG info from infosat");
class cPluginInfosatepg : public cPlugin {