diff --git a/patches/vdr-1.5.13-pluginparam.patch b/patches/vdr-1.5.13-pluginparam.patch index 68c7da0..6d35da2 100644 --- a/patches/vdr-1.5.13-pluginparam.patch +++ b/patches/vdr-1.5.13-pluginparam.patch @@ -1,6 +1,6 @@ diff -Nru vdr-1.5.13-vanilla/channels.c vdr-1.5.13-pluginparam/channels.c ---- vdr-1.5.13-vanilla/channels.c 2008-01-13 17:31:25.000000000 +0200 -+++ vdr-1.5.13-pluginparam/channels.c 2008-01-26 22:41:29.000000000 +0200 +--- vdr-1.5.13-vanilla/channels.c 2007-10-12 17:40:53.000000000 +0300 ++++ vdr-1.5.13-pluginparam/channels.c 2008-01-29 22:48:22.000000000 +0200 @@ -166,6 +166,7 @@ shortName = strdup(""); provider = strdup(""); @@ -44,17 +44,17 @@ diff -Nru vdr-1.5.13-vanilla/channels.c vdr-1.5.13-pluginparam/channels.c +bool cChannel::SetPlugTransponderData(int Source, int Frequency, const char *PluginParam) +{ + if (source != Source || frequency != Frequency || (strcmp(pluginParam, PluginParam) != 0)) { -+ if (Number()) { -+ dsyslog("changing transponder data of channel %d from %s:%d:%s to %s:%d:%s", Number(), *cSource::ToString(source), frequency, pluginParam, *cSource::ToString(Source), Frequency, PluginParam); -+ modification |= CHANNELMOD_TRANSP; -+ Channels.SetModified(); -+ } -+ source = Source; -+ frequency = Frequency; -+ pluginParam = strcpyrealloc(pluginParam, PluginParam); -+ schedule = NULL; -+ } -+ return true; ++ if (Number()) { ++ dsyslog("changing transponder data of channel %d from %s:%d:%s to %s:%d:%s", Number(), *cSource::ToString(source), frequency, pluginParam, *cSource::ToString(Source), Frequency, PluginParam); ++ modification |= CHANNELMOD_TRANSP; ++ Channels.SetModified(); ++ } ++ source = Source; ++ frequency = Frequency; ++ pluginParam = strcpyrealloc(pluginParam, PluginParam); ++ schedule = NULL; ++ } ++ return true; +} + bool cChannel::SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH) @@ -123,8 +123,8 @@ diff -Nru vdr-1.5.13-vanilla/channels.c vdr-1.5.13-pluginparam/channels.c free(parambuf); free(sourcebuf); diff -Nru vdr-1.5.13-vanilla/channels.h vdr-1.5.13-pluginparam/channels.h ---- vdr-1.5.13-vanilla/channels.h 2008-01-13 17:31:25.000000000 +0200 -+++ vdr-1.5.13-pluginparam/channels.h 2008-01-26 22:41:29.000000000 +0200 +--- vdr-1.5.13-vanilla/channels.h 2007-09-02 13:23:11.000000000 +0300 ++++ vdr-1.5.13-pluginparam/channels.h 2008-01-29 22:47:43.000000000 +0200 @@ -114,6 +114,7 @@ char *shortName; char *provider; @@ -165,8 +165,8 @@ diff -Nru vdr-1.5.13-vanilla/channels.h vdr-1.5.13-pluginparam/channels.h void SetCaIds(const int *CaIds); // list must be zero-terminated void SetCaDescriptors(int Level); diff -Nru vdr-1.5.13-vanilla/config.h vdr-1.5.13-pluginparam/config.h ---- vdr-1.5.13-vanilla/config.h 2008-01-13 17:31:25.000000000 +0200 -+++ vdr-1.5.13-pluginparam/config.h 2008-01-26 22:41:29.000000000 +0200 +--- vdr-1.5.13-vanilla/config.h 2007-11-25 15:45:48.000000000 +0200 ++++ vdr-1.5.13-pluginparam/config.h 2008-01-29 22:47:43.000000000 +0200 @@ -30,6 +30,8 @@ #define APIVERSION "1.5.13" #define APIVERSNUM 10513 // Version * 10000 + Major * 100 + Minor @@ -177,8 +177,8 @@ diff -Nru vdr-1.5.13-vanilla/config.h vdr-1.5.13-pluginparam/config.h // may be smaller than VDRVERSION in case there have been no changes to // VDR header files since the last APIVERSION. This allows compiled diff -Nru vdr-1.5.13-vanilla/menu.c vdr-1.5.13-pluginparam/menu.c ---- vdr-1.5.13-vanilla/menu.c 2008-01-13 17:31:25.000000000 +0200 -+++ vdr-1.5.13-pluginparam/menu.c 2008-01-26 22:41:29.000000000 +0200 +--- vdr-1.5.13-vanilla/menu.c 2008-01-13 15:59:33.000000000 +0200 ++++ vdr-1.5.13-pluginparam/menu.c 2008-01-29 22:47:43.000000000 +0200 @@ -219,6 +219,7 @@ cChannel *channel; cChannel data; @@ -212,8 +212,8 @@ diff -Nru vdr-1.5.13-vanilla/menu.c vdr-1.5.13-pluginparam/menu.c *channel = data; isyslog("edited channel %d %s", channel->Number(), *data.ToText()); diff -Nru vdr-1.5.13-vanilla/po/fi_FI.po vdr-1.5.13-pluginparam/po/fi_FI.po ---- vdr-1.5.13-vanilla/po/fi_FI.po 2008-01-13 17:31:25.000000000 +0200 -+++ vdr-1.5.13-pluginparam/po/fi_FI.po 2008-01-26 22:41:29.000000000 +0200 +--- vdr-1.5.13-vanilla/po/fi_FI.po 2008-01-13 17:06:32.000000000 +0200 ++++ vdr-1.5.13-pluginparam/po/fi_FI.po 2008-01-29 22:47:43.000000000 +0200 @@ -1001,3 +1001,6 @@ #, c-format msgid "VDR will shut down in %s minutes" @@ -222,8 +222,8 @@ diff -Nru vdr-1.5.13-vanilla/po/fi_FI.po vdr-1.5.13-pluginparam/po/fi_FI.po +msgid "Parameters" +msgstr "Parametrit" diff -Nru vdr-1.5.13-vanilla/po/fr_FR.po vdr-1.5.13-pluginparam/po/fr_FR.po ---- vdr-1.5.13-vanilla/po/fr_FR.po 2008-01-13 17:31:25.000000000 +0200 -+++ vdr-1.5.13-pluginparam/po/fr_FR.po 2008-01-26 22:41:41.000000000 +0200 +--- vdr-1.5.13-vanilla/po/fr_FR.po 2008-01-13 17:06:32.000000000 +0200 ++++ vdr-1.5.13-pluginparam/po/fr_FR.po 2008-01-29 22:47:43.000000000 +0200 @@ -1004,3 +1004,6 @@ #, c-format msgid "VDR will shut down in %s minutes" @@ -232,8 +232,8 @@ diff -Nru vdr-1.5.13-vanilla/po/fr_FR.po vdr-1.5.13-pluginparam/po/fr_FR.po +msgid "Parameters" +msgstr "Paramètres" diff -Nru vdr-1.5.13-vanilla/sources.c vdr-1.5.13-pluginparam/sources.c ---- vdr-1.5.13-vanilla/sources.c 2008-01-13 17:31:25.000000000 +0200 -+++ vdr-1.5.13-pluginparam/sources.c 2008-01-26 22:41:29.000000000 +0200 +--- vdr-1.5.13-vanilla/sources.c 2004-12-26 13:58:52.000000000 +0200 ++++ vdr-1.5.13-pluginparam/sources.c 2008-01-29 22:47:43.000000000 +0200 @@ -37,6 +37,7 @@ char buffer[16]; char *q = buffer; @@ -251,8 +251,8 @@ diff -Nru vdr-1.5.13-vanilla/sources.c vdr-1.5.13-pluginparam/sources.c case 'S': type = stSat; break; case 'T': type = stTerr; break; diff -Nru vdr-1.5.13-vanilla/sources.conf vdr-1.5.13-pluginparam/sources.conf ---- vdr-1.5.13-vanilla/sources.conf 2008-01-13 17:31:25.000000000 +0200 -+++ vdr-1.5.13-pluginparam/sources.conf 2008-01-26 22:41:29.000000000 +0200 +--- vdr-1.5.13-vanilla/sources.conf 2007-02-17 18:15:13.000000000 +0200 ++++ vdr-1.5.13-pluginparam/sources.conf 2008-01-29 22:47:43.000000000 +0200 @@ -188,3 +188,7 @@ # Terrestrial @@ -262,8 +262,8 @@ diff -Nru vdr-1.5.13-vanilla/sources.conf vdr-1.5.13-pluginparam/sources.conf + +P Plugin diff -Nru vdr-1.5.13-vanilla/sources.h vdr-1.5.13-pluginparam/sources.h ---- vdr-1.5.13-vanilla/sources.h 2008-01-13 17:31:25.000000000 +0200 -+++ vdr-1.5.13-pluginparam/sources.h 2008-01-26 22:41:29.000000000 +0200 +--- vdr-1.5.13-vanilla/sources.h 2005-05-14 12:30:41.000000000 +0300 ++++ vdr-1.5.13-pluginparam/sources.h 2008-01-29 22:47:43.000000000 +0200 @@ -16,10 +16,11 @@ public: enum eSourceType {