Updated pluginparam patches.

This commit is contained in:
Rolf Ahrenberg 2008-03-13 23:32:51 +00:00
parent aaf93246c1
commit 698ebb3a3c
1 changed files with 27 additions and 27 deletions

View File

@ -1,6 +1,6 @@
diff -Nru vdr-1.5.15-vanilla/channels.c vdr-1.5.15-pluginparam/channels.c diff -Nru vdr-1.5.17-vanilla/channels.c vdr-1.5.17-pluginparam/channels.c
--- vdr-1.5.15-vanilla/channels.c 2008-02-17 17:21:42.000000000 +0200 --- vdr-1.5.17-vanilla/channels.c 2008-03-02 19:09:57.000000000 +0200
+++ vdr-1.5.15-pluginparam/channels.c 2008-02-17 19:11:29.000000000 +0200 +++ vdr-1.5.17-pluginparam/channels.c 2008-03-02 19:14:56.000000000 +0200
@@ -166,6 +166,7 @@ @@ -166,6 +166,7 @@
shortName = strdup(""); shortName = strdup("");
provider = strdup(""); provider = strdup("");
@ -122,9 +122,9 @@ diff -Nru vdr-1.5.15-vanilla/channels.c vdr-1.5.15-pluginparam/channels.c
free(parambuf); free(parambuf);
free(sourcebuf); free(sourcebuf);
diff -Nru vdr-1.5.15-vanilla/channels.h vdr-1.5.15-pluginparam/channels.h diff -Nru vdr-1.5.17-vanilla/channels.h vdr-1.5.17-pluginparam/channels.h
--- vdr-1.5.15-vanilla/channels.h 2008-02-17 17:21:42.000000000 +0200 --- vdr-1.5.17-vanilla/channels.h 2008-03-02 19:09:57.000000000 +0200
+++ vdr-1.5.15-pluginparam/channels.h 2008-02-17 19:11:29.000000000 +0200 +++ vdr-1.5.17-pluginparam/channels.h 2008-03-02 19:14:56.000000000 +0200
@@ -114,6 +114,7 @@ @@ -114,6 +114,7 @@
char *shortName; char *shortName;
char *provider; char *provider;
@ -164,9 +164,9 @@ diff -Nru vdr-1.5.15-vanilla/channels.h vdr-1.5.15-pluginparam/channels.h
void SetPids(int Vpid, int Ppid, int *Apids, char ALangs[][MAXLANGCODE2], int *Dpids, char DLangs[][MAXLANGCODE2], int *Spids, char SLangs[][MAXLANGCODE2], int Tpid); void SetPids(int Vpid, int Ppid, int *Apids, char ALangs[][MAXLANGCODE2], int *Dpids, char DLangs[][MAXLANGCODE2], int *Spids, char SLangs[][MAXLANGCODE2], int Tpid);
void SetCaIds(const int *CaIds); // list must be zero-terminated void SetCaIds(const int *CaIds); // list must be zero-terminated
void SetCaDescriptors(int Level); void SetCaDescriptors(int Level);
diff -Nru vdr-1.5.15-vanilla/config.h vdr-1.5.15-pluginparam/config.h diff -Nru vdr-1.5.17-vanilla/config.h vdr-1.5.17-pluginparam/config.h
--- vdr-1.5.15-vanilla/config.h 2008-02-17 17:21:42.000000000 +0200 --- vdr-1.5.17-vanilla/config.h 2008-03-02 19:09:57.000000000 +0200
+++ vdr-1.5.15-pluginparam/config.h 2008-02-17 19:11:29.000000000 +0200 +++ vdr-1.5.17-pluginparam/config.h 2008-03-02 19:14:56.000000000 +0200
@@ -30,6 +30,8 @@ @@ -30,6 +30,8 @@
#define APIVERSION "1.5.15" #define APIVERSION "1.5.15"
#define APIVERSNUM 10515 // Version * 10000 + Major * 100 + Minor #define APIVERSNUM 10515 // Version * 10000 + Major * 100 + Minor
@ -176,9 +176,9 @@ diff -Nru vdr-1.5.15-vanilla/config.h vdr-1.5.15-pluginparam/config.h
// When loading plugins, VDR searches them by their APIVERSION, which // When loading plugins, VDR searches them by their APIVERSION, which
// may be smaller than VDRVERSION in case there have been no changes to // may be smaller than VDRVERSION in case there have been no changes to
// VDR header files since the last APIVERSION. This allows compiled // VDR header files since the last APIVERSION. This allows compiled
diff -Nru vdr-1.5.15-vanilla/menu.c vdr-1.5.15-pluginparam/menu.c diff -Nru vdr-1.5.17-vanilla/menu.c vdr-1.5.17-pluginparam/menu.c
--- vdr-1.5.15-vanilla/menu.c 2008-02-17 17:21:42.000000000 +0200 --- vdr-1.5.17-vanilla/menu.c 2008-03-02 19:09:57.000000000 +0200
+++ vdr-1.5.15-pluginparam/menu.c 2008-02-17 19:11:29.000000000 +0200 +++ vdr-1.5.17-pluginparam/menu.c 2008-03-02 19:14:56.000000000 +0200
@@ -253,6 +253,7 @@ @@ -253,6 +253,7 @@
cChannel *channel; cChannel *channel;
cChannel data; cChannel data;
@ -211,9 +211,9 @@ diff -Nru vdr-1.5.15-vanilla/menu.c vdr-1.5.15-pluginparam/menu.c
if (channel) { if (channel) {
*channel = data; *channel = data;
isyslog("edited channel %d %s", channel->Number(), *data.ToText()); isyslog("edited channel %d %s", channel->Number(), *data.ToText());
diff -Nru vdr-1.5.15-vanilla/po/fi_FI.po vdr-1.5.15-pluginparam/po/fi_FI.po diff -Nru vdr-1.5.17-vanilla/po/fi_FI.po vdr-1.5.17-pluginparam/po/fi_FI.po
--- vdr-1.5.15-vanilla/po/fi_FI.po 2008-02-17 17:21:42.000000000 +0200 --- vdr-1.5.17-vanilla/po/fi_FI.po 2008-03-02 19:09:57.000000000 +0200
+++ vdr-1.5.15-pluginparam/po/fi_FI.po 2008-02-17 19:11:29.000000000 +0200 +++ vdr-1.5.17-pluginparam/po/fi_FI.po 2008-03-02 19:14:56.000000000 +0200
@@ -1001,3 +1001,6 @@ @@ -1001,3 +1001,6 @@
#, c-format #, c-format
msgid "VDR will shut down in %s minutes" msgid "VDR will shut down in %s minutes"
@ -221,9 +221,9 @@ diff -Nru vdr-1.5.15-vanilla/po/fi_FI.po vdr-1.5.15-pluginparam/po/fi_FI.po
+ +
+msgid "Parameters" +msgid "Parameters"
+msgstr "Parametrit" +msgstr "Parametrit"
diff -Nru vdr-1.5.15-vanilla/po/fr_FR.po vdr-1.5.15-pluginparam/po/fr_FR.po diff -Nru vdr-1.5.17-vanilla/po/fr_FR.po vdr-1.5.17-pluginparam/po/fr_FR.po
--- vdr-1.5.15-vanilla/po/fr_FR.po 2008-02-17 17:21:42.000000000 +0200 --- vdr-1.5.17-vanilla/po/fr_FR.po 2008-03-02 19:09:57.000000000 +0200
+++ vdr-1.5.15-pluginparam/po/fr_FR.po 2008-02-17 19:11:29.000000000 +0200 +++ vdr-1.5.17-pluginparam/po/fr_FR.po 2008-03-02 19:14:56.000000000 +0200
@@ -1004,3 +1004,6 @@ @@ -1004,3 +1004,6 @@
#, c-format #, c-format
msgid "VDR will shut down in %s minutes" msgid "VDR will shut down in %s minutes"
@ -231,9 +231,9 @@ diff -Nru vdr-1.5.15-vanilla/po/fr_FR.po vdr-1.5.15-pluginparam/po/fr_FR.po
+ +
+msgid "Parameters" +msgid "Parameters"
+msgstr "Paramètres" +msgstr "Paramètres"
diff -Nru vdr-1.5.15-vanilla/sources.c vdr-1.5.15-pluginparam/sources.c diff -Nru vdr-1.5.17-vanilla/sources.c vdr-1.5.17-pluginparam/sources.c
--- vdr-1.5.15-vanilla/sources.c 2008-02-17 17:21:42.000000000 +0200 --- vdr-1.5.17-vanilla/sources.c 2008-03-02 19:09:57.000000000 +0200
+++ vdr-1.5.15-pluginparam/sources.c 2008-02-17 19:11:29.000000000 +0200 +++ vdr-1.5.17-pluginparam/sources.c 2008-03-02 19:14:56.000000000 +0200
@@ -37,6 +37,7 @@ @@ -37,6 +37,7 @@
char buffer[16]; char buffer[16];
char *q = buffer; char *q = buffer;
@ -250,9 +250,9 @@ diff -Nru vdr-1.5.15-vanilla/sources.c vdr-1.5.15-pluginparam/sources.c
case 'C': type = stCable; break; case 'C': type = stCable; break;
case 'S': type = stSat; break; case 'S': type = stSat; break;
case 'T': type = stTerr; break; case 'T': type = stTerr; break;
diff -Nru vdr-1.5.15-vanilla/sources.conf vdr-1.5.15-pluginparam/sources.conf diff -Nru vdr-1.5.17-vanilla/sources.conf vdr-1.5.17-pluginparam/sources.conf
--- vdr-1.5.15-vanilla/sources.conf 2008-02-17 17:21:42.000000000 +0200 --- vdr-1.5.17-vanilla/sources.conf 2008-03-02 19:09:57.000000000 +0200
+++ vdr-1.5.15-pluginparam/sources.conf 2008-02-17 19:11:29.000000000 +0200 +++ vdr-1.5.17-pluginparam/sources.conf 2008-03-02 19:14:56.000000000 +0200
@@ -188,3 +188,7 @@ @@ -188,3 +188,7 @@
# Terrestrial # Terrestrial
@ -261,9 +261,9 @@ diff -Nru vdr-1.5.15-vanilla/sources.conf vdr-1.5.15-pluginparam/sources.conf
+# Plugin +# Plugin
+ +
+P Plugin +P Plugin
diff -Nru vdr-1.5.15-vanilla/sources.h vdr-1.5.15-pluginparam/sources.h diff -Nru vdr-1.5.17-vanilla/sources.h vdr-1.5.17-pluginparam/sources.h
--- vdr-1.5.15-vanilla/sources.h 2008-02-17 17:21:42.000000000 +0200 --- vdr-1.5.17-vanilla/sources.h 2008-03-02 19:09:57.000000000 +0200
+++ vdr-1.5.15-pluginparam/sources.h 2008-02-17 19:11:29.000000000 +0200 +++ vdr-1.5.17-pluginparam/sources.h 2008-03-02 19:14:56.000000000 +0200
@@ -16,10 +16,11 @@ @@ -16,10 +16,11 @@
public: public:
enum eSourceType { enum eSourceType {