From 542037454361805f653a986ce2c1e4557c2e8219 Mon Sep 17 00:00:00 2001 From: Rolf Ahrenberg Date: Tue, 19 Feb 2008 22:30:43 +0000 Subject: [PATCH] Removed obsolete patches. --- patches/vdr-1.4.7-closefilter.patch | 80 ------- patches/vdr-1.4.7-pluginparam.patch | 299 --------------------------- patches/vdr-1.5.13-pluginparam.patch | 287 ------------------------- patches/vdr-1.5.14-pluginparam.patch | 288 -------------------------- 4 files changed, 954 deletions(-) delete mode 100644 patches/vdr-1.4.7-closefilter.patch delete mode 100644 patches/vdr-1.4.7-pluginparam.patch delete mode 100644 patches/vdr-1.5.13-pluginparam.patch delete mode 100644 patches/vdr-1.5.14-pluginparam.patch diff --git a/patches/vdr-1.4.7-closefilter.patch b/patches/vdr-1.4.7-closefilter.patch deleted file mode 100644 index f922c93..0000000 --- a/patches/vdr-1.4.7-closefilter.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff -Nru vdr-1.4.7-vanilla/config.h vdr-1.4.7-closefilter/config.h ---- vdr-1.4.7-vanilla/config.h 2007-10-27 01:08:39.000000000 +0300 -+++ vdr-1.4.7-closefilter/config.h 2007-10-27 01:39:43.000000000 +0300 -@@ -29,6 +29,8 @@ - #define APIVERSION "1.4.5" - #define APIVERSNUM 10405 // Version * 10000 + Major * 100 + Minor - -+#define CLOSEFILTERPATCHVERSNUM 1 -+ - // When loading plugins, VDR searches them by their APIVERSION, which - // 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.4.7-vanilla/device.c vdr-1.4.7-closefilter/device.c ---- vdr-1.4.7-vanilla/device.c 2007-10-27 01:08:39.000000000 +0300 -+++ vdr-1.4.7-closefilter/device.c 2007-10-27 01:37:34.000000000 +0300 -@@ -509,6 +509,11 @@ - return -1; - } - -+void cDevice::CloseFilter(int Handle) -+{ -+ close(Handle); -+} -+ - void cDevice::AttachFilter(cFilter *Filter) - { - if (sectionHandler) -diff -Nru vdr-1.4.7-vanilla/device.h vdr-1.4.7-closefilter/device.h ---- vdr-1.4.7-vanilla/device.h 2007-10-27 01:08:39.000000000 +0300 -+++ vdr-1.4.7-closefilter/device.h 2007-10-27 01:37:19.000000000 +0300 -@@ -302,6 +302,11 @@ - ///< Opens a file handle for the given filter data. - ///< A derived device that provides section data must - ///< implement this function. -+ virtual void CloseFilter(int Handle); -+ ///< Closes a file handle that has previously been opened -+ ///< by OpenFilter(). If this is as simple as calling close(Handle), -+ ///< a derived class need not implement this function, because this -+ ///< is done by the default implementation. - void AttachFilter(cFilter *Filter); - ///< Attaches the given filter to this device. - void Detach(cFilter *Filter); -diff -Nru vdr-1.4.7-vanilla/dvbdevice.c vdr-1.4.7-closefilter/dvbdevice.c ---- vdr-1.4.7-vanilla/dvbdevice.c 2007-10-27 01:08:39.000000000 +0300 -+++ vdr-1.4.7-closefilter/dvbdevice.c 2007-10-27 01:37:50.000000000 +0300 -@@ -726,6 +726,11 @@ - return -1; - } - -+void cDvbDevice::CloseFilter(int Handle) -+{ -+ close(Handle); -+} -+ - void cDvbDevice::TurnOffLiveMode(bool LiveView) - { - if (LiveView) { -diff -Nru vdr-1.4.7-vanilla/dvbdevice.h vdr-1.4.7-closefilter/dvbdevice.h ---- vdr-1.4.7-vanilla/dvbdevice.h 2007-10-27 01:08:39.000000000 +0300 -+++ vdr-1.4.7-closefilter/dvbdevice.h 2007-10-27 01:37:59.000000000 +0300 -@@ -79,6 +79,7 @@ - - protected: - virtual int OpenFilter(u_short Pid, u_char Tid, u_char Mask); -+ virtual void CloseFilter(int Handle); - - // Image Grab facilities - -diff -Nru vdr-1.4.7-vanilla/sections.c vdr-1.4.7-closefilter/sections.c ---- vdr-1.4.7-vanilla/sections.c 2007-10-27 01:08:39.000000000 +0300 -+++ vdr-1.4.7-closefilter/sections.c 2007-10-27 01:34:06.000000000 +0300 -@@ -105,7 +105,7 @@ - for (fh = filterHandles.First(); fh; fh = filterHandles.Next(fh)) { - if (fh->filterData.Is(FilterData->pid, FilterData->tid, FilterData->mask)) { - if (--fh->used <= 0) { -- close(fh->handle); -+ device->CloseFilter(fh->handle); - filterHandles.Del(fh); - break; - } diff --git a/patches/vdr-1.4.7-pluginparam.patch b/patches/vdr-1.4.7-pluginparam.patch deleted file mode 100644 index 42cee49..0000000 --- a/patches/vdr-1.4.7-pluginparam.patch +++ /dev/null @@ -1,299 +0,0 @@ -diff -Nru vdr-1.4.7-vanilla/channels.c vdr-1.4.7-pluginparam/channels.c ---- vdr-1.4.7-vanilla/channels.c 2007-10-27 01:08:39.000000000 +0300 -+++ vdr-1.4.7-pluginparam/channels.c 2007-10-27 01:09:05.000000000 +0300 -@@ -166,6 +166,7 @@ - shortName = strdup(""); - provider = strdup(""); - portalName = strdup(""); -+ pluginParam = strdup(""); - memset(&__BeginData__, 0, (char *)&__EndData__ - (char *)&__BeginData__); - inversion = INVERSION_AUTO; - bandwidth = BANDWIDTH_AUTO; -@@ -187,6 +188,7 @@ - shortName = NULL; - provider = NULL; - portalName = NULL; -+ pluginParam = NULL; - schedule = NULL; - linkChannels = NULL; - refChannel = NULL; -@@ -215,6 +217,7 @@ - free(shortName); - free(provider); - free(portalName); -+ free(pluginParam); - } - - cChannel& cChannel::operator= (const cChannel &Channel) -@@ -223,6 +226,7 @@ - shortName = strcpyrealloc(shortName, Channel.shortName); - provider = strcpyrealloc(provider, Channel.provider); - portalName = strcpyrealloc(portalName, Channel.portalName); -+ pluginParam = strcpyrealloc(pluginParam, Channel.pluginParam); - memcpy(&__BeginData__, &Channel.__BeginData__, (char *)&Channel.__EndData__ - (char *)&Channel.__BeginData__); - return *this; - } -@@ -280,9 +284,26 @@ - transmission = Channel->transmission; - guard = Channel->guard; - hierarchy = Channel->hierarchy; -+ if (IsPlug()) pluginParam = strcpyrealloc(pluginParam, Channel->pluginParam); - } - } - -+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; -+} -+ - bool cChannel::SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH) - { - // Workarounds for broadcaster stupidity: -@@ -407,6 +428,18 @@ - } - } - -+void cChannel::SetPluginParam(const char *PluginParam) -+{ -+ if (!isempty(PluginParam) && strcmp(pluginParam, PluginParam) != 0) { -+ if (Number()) { -+ dsyslog("changing plugin parameters of channel %d from '%s' to '%s'", Number(), pluginParam, PluginParam); -+ modification |= CHANNELMOD_TRANSP; -+ Channels.SetModified(); -+ } -+ pluginParam = strcpyrealloc(pluginParam, PluginParam); -+ } -+} -+ - #define STRDIFF 0x01 - #define VALDIFF 0x02 - -@@ -579,7 +612,7 @@ - if (isdigit(type)) - type = 'S'; - #define ST(s) if (strchr(s, type)) -- char buffer[64]; -+ char buffer[256]; - char *q = buffer; - *q = 0; - ST(" S ") q += sprintf(q, "%c", polarization); -@@ -591,6 +624,7 @@ - ST(" T") q += PrintParameter(q, 'T', MapToUser(transmission, TransmissionValues)); - ST(" T") q += PrintParameter(q, 'G', MapToUser(guard, GuardValues)); - ST(" T") q += PrintParameter(q, 'Y', MapToUser(hierarchy, HierarchyValues)); -+ ST("P ") snprintf(buffer, sizeof(buffer), "%s", pluginParam); - return buffer; - } - -@@ -612,7 +646,7 @@ - - bool cChannel::StringToParameters(const char *s) - { -- while (s && *s) { -+ while (s && *s && !IsPlug()) { - switch (toupper(*s)) { - case 'B': s = ParseParameter(s, bandwidth, BandwidthValues); break; - case 'C': s = ParseParameter(s, coderateH, CoderateValues); break; -@@ -722,7 +756,7 @@ - dpids[0] = 0; - ok = false; - if (parambuf && sourcebuf && vpidbuf && apidbuf) { -- ok = StringToParameters(parambuf) && (source = cSource::FromString(sourcebuf)) >= 0; -+ ok = ((source = cSource::FromString(sourcebuf)) >= 0) && StringToParameters(parambuf); - - char *p = strchr(vpidbuf, '+'); - if (p) -@@ -813,6 +847,7 @@ - shortName = strcpyrealloc(shortName, p); - } - name = strcpyrealloc(name, namebuf); -+ if (IsPlug()) pluginParam = strcpyrealloc(pluginParam, parambuf); - - free(parambuf); - free(sourcebuf); -diff -Nru vdr-1.4.7-vanilla/channels.h vdr-1.4.7-pluginparam/channels.h ---- vdr-1.4.7-vanilla/channels.h 2007-10-27 01:08:39.000000000 +0300 -+++ vdr-1.4.7-pluginparam/channels.h 2007-10-27 01:12:37.000000000 +0300 -@@ -114,6 +114,7 @@ - char *shortName; - char *provider; - char *portalName; -+ char *pluginParam; - int __BeginData__; - int frequency; // MHz - int source; -@@ -165,6 +166,7 @@ - int Frequency(void) const { return frequency; } ///< Returns the actual frequency, as given in 'channels.conf' - int Transponder(void) const; ///< Returns the transponder frequency in MHz, plus the polarization in case of sat - static int Transponder(int Frequency, char Polarization); ///< builds the transponder from the given Frequency and Polarization -+ const char *PluginParam(void) const { return pluginParam; } - int Source(void) const { return source; } - int Srate(void) const { return srate; } - int Vpid(void) const { return vpid; } -@@ -198,6 +200,7 @@ - int Hierarchy(void) const { return hierarchy; } - const cLinkChannels* LinkChannels(void) const { return linkChannels; } - const cChannel *RefChannel(void) const { return refChannel; } -+ bool IsPlug(void) const { return cSource::IsPlug(source); } - bool IsCable(void) const { return cSource::IsCable(source); } - bool IsSat(void) const { return cSource::IsSat(source); } - bool IsTerr(void) const { return cSource::IsTerr(source); } -@@ -205,12 +208,14 @@ - bool HasTimer(void) const; - int Modification(int Mask = CHANNELMOD_ALL); - void CopyTransponderData(const cChannel *Channel); -+ bool SetPlugTransponderData(int Source, int Frequency, const char *PluginParam); - bool SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH); - bool SetCableTransponderData(int Source, int Frequency, int Modulation, int Srate, int CoderateH); - bool SetTerrTransponderData(int Source, int Frequency, int Bandwidth, int Modulation, int Hierarchy, int CodeRateH, int CodeRateL, int Guard, int Transmission); - void SetId(int Nid, int Tid, int Sid, int Rid = 0); - void SetName(const char *Name, const char *ShortName, const char *Provider); - void SetPortalName(const char *PortalName); -+ void SetPluginParam(const char *PluginParam); - void SetPids(int Vpid, int Ppid, int *Apids, char ALangs[][MAXLANGCODE2], int *Dpids, char DLangs[][MAXLANGCODE2], int Tpid); - void SetCaIds(const int *CaIds); // list must be zero-terminated - void SetCaDescriptors(int Level); -diff -Nru vdr-1.4.7-vanilla/config.h vdr-1.4.7-pluginparam/config.h ---- vdr-1.4.7-vanilla/config.h 2007-10-27 01:08:39.000000000 +0300 -+++ vdr-1.4.7-pluginparam/config.h 2007-10-27 01:14:39.000000000 +0300 -@@ -29,6 +29,8 @@ - #define APIVERSION "1.4.5" - #define APIVERSNUM 10405 // Version * 10000 + Major * 100 + Minor - -+#define PLUGINPARAMPATCHVERSNUM 1 -+ - // When loading plugins, VDR searches them by their APIVERSION, which - // 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.4.7-vanilla/i18n.c vdr-1.4.7-pluginparam/i18n.c ---- vdr-1.4.7-vanilla/i18n.c 2007-10-27 01:08:39.000000000 +0300 -+++ vdr-1.4.7-pluginparam/i18n.c 2007-10-27 01:11:38.000000000 +0300 -@@ -6126,6 +6126,28 @@ - "Ingen titel", - "Bez názvu", - }, -+ { "Parameters", -+ "",// TODO -+ "",// TODO -+ "",// TODO -+ "",// TODO -+ "",// TODO -+ "",// TODO -+ "",// TODO -+ "Parametrit", -+ "",// TODO -+ "",// TODO -+ "",// TODO -+ "",// TODO -+ "",// TODO -+ "",// TODO -+ "",// TODO -+ "",// TODO -+ "",// TODO -+ "",// TODO -+ "",// TODO -+ "",// TODO -+ }, - { NULL } - }; - -diff -Nru vdr-1.4.7-vanilla/menu.c vdr-1.4.7-pluginparam/menu.c ---- vdr-1.4.7-vanilla/menu.c 2007-10-27 01:08:39.000000000 +0300 -+++ vdr-1.4.7-pluginparam/menu.c 2007-10-27 01:09:05.000000000 +0300 -@@ -216,6 +216,7 @@ - cChannel *channel; - cChannel data; - char name[256]; -+ char pluginParam[256]; - void Setup(void); - public: - cMenuEditChannel(cChannel *Channel, bool New = false); -@@ -248,6 +249,7 @@ - - // Parameters for all types of sources: - strn0cpy(name, data.name, sizeof(name)); -+ strn0cpy(pluginParam, data.pluginParam, sizeof(pluginParam)); - Add(new cMenuEditStrItem( tr("Name"), name, sizeof(name), tr(FileNameChars))); - Add(new cMenuEditSrcItem( tr("Source"), &data.source)); - Add(new cMenuEditIntItem( tr("Frequency"), &data.frequency)); -@@ -276,6 +278,7 @@ - ST(" T") Add(new cMenuEditMapItem( tr("Transmission"), &data.transmission, TransmissionValues)); - ST(" T") Add(new cMenuEditMapItem( tr("Guard"), &data.guard, GuardValues)); - ST(" T") Add(new cMenuEditMapItem( tr("Hierarchy"), &data.hierarchy, HierarchyValues, tr("none"))); -+ ST("P ") Add(new cMenuEditStrItem( tr("Parameters"), pluginParam, sizeof(pluginParam), tr(FileNameChars))); - - SetCurrent(Get(current)); - Display(); -@@ -290,6 +293,7 @@ - if (Key == kOk) { - if (Channels.HasUniqueChannelID(&data, channel)) { - data.name = strcpyrealloc(data.name, name); -+ data.pluginParam = strcpyrealloc(data.pluginParam, pluginParam); - if (channel) { - *channel = data; - isyslog("edited channel %d %s", channel->Number(), *data.ToText()); -diff -Nru vdr-1.4.7-vanilla/sources.c vdr-1.4.7-pluginparam/sources.c ---- vdr-1.4.7-vanilla/sources.c 2007-10-27 01:08:39.000000000 +0300 -+++ vdr-1.4.7-pluginparam/sources.c 2007-10-27 01:09:20.000000000 +0300 -@@ -37,6 +37,7 @@ - char buffer[16]; - char *q = buffer; - switch (Code & st_Mask) { -+ case stPlug: *q++ = 'P'; break; - case stCable: *q++ = 'C'; break; - case stSat: *q++ = 'S'; - { -@@ -56,6 +57,7 @@ - { - int type = stNone; - switch (toupper(*s)) { -+ case 'P': type = stPlug; break; - case 'C': type = stCable; break; - case 'S': type = stSat; break; - case 'T': type = stTerr; break; -diff -Nru vdr-1.4.7-vanilla/sources.conf vdr-1.4.7-pluginparam/sources.conf ---- vdr-1.4.7-vanilla/sources.conf 2007-10-27 01:08:39.000000000 +0300 -+++ vdr-1.4.7-pluginparam/sources.conf 2007-10-27 01:09:20.000000000 +0300 -@@ -188,3 +188,7 @@ - # Terrestrial - - T Terrestrial -+ -+# Plugin -+ -+P Plugin -diff -Nru vdr-1.4.7-vanilla/sources.h vdr-1.4.7-pluginparam/sources.h ---- vdr-1.4.7-vanilla/sources.h 2007-10-27 01:08:40.000000000 +0300 -+++ vdr-1.4.7-pluginparam/sources.h 2007-10-27 01:09:20.000000000 +0300 -@@ -16,10 +16,11 @@ - public: - enum eSourceType { - stNone = 0x0000, -+ stPlug = 0x2000, - stCable = 0x4000, - stSat = 0x8000, - stTerr = 0xC000, -- st_Mask = 0xC000, -+ st_Mask = 0xE000, - st_Neg = 0x0800, - st_Pos = 0x07FF, - }; -@@ -35,6 +36,7 @@ - static cString ToString(int Code); - static int FromString(const char *s); - static int FromData(eSourceType SourceType, int Position = 0, bool East = false); -+ static bool IsPlug(int Code) { return (Code & st_Mask) == stPlug; } - static bool IsCable(int Code) { return (Code & st_Mask) == stCable; } - static bool IsSat(int Code) { return (Code & st_Mask) == stSat; } - static bool IsTerr(int Code) { return (Code & st_Mask) == stTerr; } diff --git a/patches/vdr-1.5.13-pluginparam.patch b/patches/vdr-1.5.13-pluginparam.patch deleted file mode 100644 index 6d35da2..0000000 --- a/patches/vdr-1.5.13-pluginparam.patch +++ /dev/null @@ -1,287 +0,0 @@ -diff -Nru vdr-1.5.13-vanilla/channels.c vdr-1.5.13-pluginparam/channels.c ---- 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(""); - portalName = strdup(""); -+ pluginParam = strdup(""); - memset(&__BeginData__, 0, (char *)&__EndData__ - (char *)&__BeginData__); - inversion = INVERSION_AUTO; - bandwidth = BANDWIDTH_AUTO; -@@ -187,6 +188,7 @@ - shortName = NULL; - provider = NULL; - portalName = NULL; -+ pluginParam = NULL; - schedule = NULL; - linkChannels = NULL; - refChannel = NULL; -@@ -215,6 +217,7 @@ - free(shortName); - free(provider); - free(portalName); -+ free(pluginParam); - } - - cChannel& cChannel::operator= (const cChannel &Channel) -@@ -223,6 +226,7 @@ - shortName = strcpyrealloc(shortName, Channel.shortName); - provider = strcpyrealloc(provider, Channel.provider); - portalName = strcpyrealloc(portalName, Channel.portalName); -+ pluginParam = strcpyrealloc(pluginParam, Channel.pluginParam); - memcpy(&__BeginData__, &Channel.__BeginData__, (char *)&Channel.__EndData__ - (char *)&Channel.__BeginData__); - return *this; - } -@@ -280,9 +284,26 @@ - transmission = Channel->transmission; - guard = Channel->guard; - hierarchy = Channel->hierarchy; -+ if (IsPlug()) pluginParam = strcpyrealloc(pluginParam, Channel->pluginParam); - } - } - -+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; -+} -+ - bool cChannel::SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH) - { - // Workarounds for broadcaster stupidity: -@@ -407,6 +428,18 @@ - } - } - -+void cChannel::SetPluginParam(const char *PluginParam) -+{ -+ if (!isempty(PluginParam) && strcmp(pluginParam, PluginParam) != 0) { -+ if (Number()) { -+ dsyslog("changing plugin parameters of channel %d from '%s' to '%s'", Number(), pluginParam, PluginParam); -+ modification |= CHANNELMOD_TRANSP; -+ Channels.SetModified(); -+ } -+ pluginParam = strcpyrealloc(pluginParam, PluginParam); -+ } -+} -+ - #define STRDIFF 0x01 - #define VALDIFF 0x02 - -@@ -593,7 +626,7 @@ - if (isdigit(type)) - type = 'S'; - #define ST(s) if (strchr(s, type)) -- char buffer[64]; -+ char buffer[256]; - char *q = buffer; - *q = 0; - ST(" S ") q += sprintf(q, "%c", polarization); -@@ -605,6 +638,7 @@ - ST(" T") q += PrintParameter(q, 'T', MapToUser(transmission, TransmissionValues)); - ST(" T") q += PrintParameter(q, 'G', MapToUser(guard, GuardValues)); - ST(" T") q += PrintParameter(q, 'Y', MapToUser(hierarchy, HierarchyValues)); -+ ST("P ") snprintf(buffer, sizeof(buffer), "%s", pluginParam); - return buffer; - } - -@@ -626,7 +660,7 @@ - - bool cChannel::StringToParameters(const char *s) - { -- while (s && *s) { -+ while (s && *s && !IsPlug()) { - switch (toupper(*s)) { - case 'B': s = ParseParameter(s, bandwidth, BandwidthValues); break; - case 'C': s = ParseParameter(s, coderateH, CoderateValues); break; -@@ -736,7 +770,7 @@ - dpids[0] = 0; - ok = false; - if (parambuf && sourcebuf && vpidbuf && apidbuf) { -- ok = StringToParameters(parambuf) && (source = cSource::FromString(sourcebuf)) >= 0; -+ ok = ((source = cSource::FromString(sourcebuf)) >= 0) && StringToParameters(parambuf); - - char *p = strchr(vpidbuf, '+'); - if (p) -@@ -827,6 +861,7 @@ - shortName = strcpyrealloc(shortName, p); - } - name = strcpyrealloc(name, namebuf); -+ if (IsPlug()) pluginParam = strcpyrealloc(pluginParam, parambuf); - - 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 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; - char *portalName; -+ char *pluginParam; - int __BeginData__; - int frequency; // MHz - int source; -@@ -165,6 +166,7 @@ - int Frequency(void) const { return frequency; } ///< Returns the actual frequency, as given in 'channels.conf' - int Transponder(void) const; ///< Returns the transponder frequency in MHz, plus the polarization in case of sat - static int Transponder(int Frequency, char Polarization); ///< builds the transponder from the given Frequency and Polarization -+ const char *PluginParam(void) const { return pluginParam; } - int Source(void) const { return source; } - int Srate(void) const { return srate; } - int Vpid(void) const { return vpid; } -@@ -199,6 +201,7 @@ - int Hierarchy(void) const { return hierarchy; } - const cLinkChannels* LinkChannels(void) const { return linkChannels; } - const cChannel *RefChannel(void) const { return refChannel; } -+ bool IsPlug(void) const { return cSource::IsPlug(source); } - bool IsCable(void) const { return cSource::IsCable(source); } - bool IsSat(void) const { return cSource::IsSat(source); } - bool IsTerr(void) const { return cSource::IsTerr(source); } -@@ -206,12 +209,14 @@ - bool HasTimer(void) const; - int Modification(int Mask = CHANNELMOD_ALL); - void CopyTransponderData(const cChannel *Channel); -+ bool SetPlugTransponderData(int Source, int Frequency, const char *PluginParam); - bool SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH); - bool SetCableTransponderData(int Source, int Frequency, int Modulation, int Srate, int CoderateH); - bool SetTerrTransponderData(int Source, int Frequency, int Bandwidth, int Modulation, int Hierarchy, int CodeRateH, int CodeRateL, int Guard, int Transmission); - void SetId(int Nid, int Tid, int Sid, int Rid = 0); - void SetName(const char *Name, const char *ShortName, const char *Provider); - void SetPortalName(const char *PortalName); -+ void SetPluginParam(const char *PluginParam); - 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 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 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 - -+#define PLUGINPARAMPATCHVERSNUM 1 -+ - // When loading plugins, VDR searches them by their APIVERSION, which - // 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 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; - char name[256]; -+ char pluginParam[256]; - void Setup(void); - public: - cMenuEditChannel(cChannel *Channel, bool New = false); -@@ -251,6 +252,7 @@ - - // Parameters for all types of sources: - strn0cpy(name, data.name, sizeof(name)); -+ strn0cpy(pluginParam, data.pluginParam, sizeof(pluginParam)); - Add(new cMenuEditStrItem( tr("Name"), name, sizeof(name))); - Add(new cMenuEditSrcItem( tr("Source"), &data.source)); - Add(new cMenuEditIntItem( tr("Frequency"), &data.frequency)); -@@ -281,6 +283,7 @@ - ST(" T") Add(new cMenuEditMapItem( tr("Transmission"), &data.transmission, TransmissionValues)); - ST(" T") Add(new cMenuEditMapItem( tr("Guard"), &data.guard, GuardValues)); - ST(" T") Add(new cMenuEditMapItem( tr("Hierarchy"), &data.hierarchy, HierarchyValues, tr("none"))); -+ ST("P ") Add(new cMenuEditStrItem( tr("Parameters"), pluginParam, sizeof(pluginParam), tr(FileNameChars))); - - SetCurrent(Get(current)); - Display(); -@@ -295,6 +298,7 @@ - if (Key == kOk) { - if (Channels.HasUniqueChannelID(&data, channel)) { - data.name = strcpyrealloc(data.name, name); -+ data.pluginParam = strcpyrealloc(data.pluginParam, pluginParam); - if (channel) { - *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: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" - msgstr "VDR sammuu %s minuutin kuluttua" -+ -+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: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" - msgstr "VDR s'arrêtera dans %s minutes" -+ -+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 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; - switch (Code & st_Mask) { -+ case stPlug: *q++ = 'P'; break; - case stCable: *q++ = 'C'; break; - case stSat: *q++ = 'S'; - { -@@ -56,6 +57,7 @@ - { - int type = stNone; - switch (toupper(*s)) { -+ case 'P': type = stPlug; break; - case 'C': type = stCable; break; - 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 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 - - T Terrestrial -+ -+# Plugin -+ -+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 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 { - stNone = 0x0000, -+ stPlug = 0x2000, - stCable = 0x4000, - stSat = 0x8000, - stTerr = 0xC000, -- st_Mask = 0xC000, -+ st_Mask = 0xE000, - st_Neg = 0x0800, - st_Pos = 0x07FF, - }; -@@ -35,6 +36,7 @@ - static cString ToString(int Code); - static int FromString(const char *s); - static int FromData(eSourceType SourceType, int Position = 0, bool East = false); -+ static bool IsPlug(int Code) { return (Code & st_Mask) == stPlug; } - static bool IsCable(int Code) { return (Code & st_Mask) == stCable; } - static bool IsSat(int Code) { return (Code & st_Mask) == stSat; } - static bool IsTerr(int Code) { return (Code & st_Mask) == stTerr; } diff --git a/patches/vdr-1.5.14-pluginparam.patch b/patches/vdr-1.5.14-pluginparam.patch deleted file mode 100644 index 23a3600..0000000 --- a/patches/vdr-1.5.14-pluginparam.patch +++ /dev/null @@ -1,288 +0,0 @@ -diff -Nru vdr-1.5.14-vanilla/channels.c vdr-1.5.14-pluginparam/channels.c ---- vdr-1.5.14-vanilla/channels.c 2008-01-27 23:04:26.000000000 +0200 -+++ vdr-1.5.14-pluginparam/channels.c 2008-01-28 23:32:58.000000000 +0200 -@@ -216,6 +216,7 @@ - shortName = strdup(""); - provider = strdup(""); - portalName = strdup(""); -+ pluginParam = strdup(""); - memset(&__BeginData__, 0, (char *)&__EndData__ - (char *)&__BeginData__); - inversion = DVBFE_INVERSION_AUTO; - bandwidth = DVBFE_BANDWIDTH_AUTO; -@@ -241,6 +242,7 @@ - shortName = NULL; - provider = NULL; - portalName = NULL; -+ pluginParam = NULL; - schedule = NULL; - linkChannels = NULL; - refChannel = NULL; -@@ -269,6 +271,7 @@ - free(shortName); - free(provider); - free(portalName); -+ free(pluginParam); - } - - cChannel& cChannel::operator= (const cChannel &Channel) -@@ -277,6 +280,7 @@ - shortName = strcpyrealloc(shortName, Channel.shortName); - provider = strcpyrealloc(provider, Channel.provider); - portalName = strcpyrealloc(portalName, Channel.portalName); -+ pluginParam = strcpyrealloc(pluginParam, Channel.pluginParam); - memcpy(&__BeginData__, &Channel.__BeginData__, (char *)&Channel.__EndData__ - (char *)&Channel.__BeginData__); - return *this; - } -@@ -338,9 +342,27 @@ - alpha = Channel->alpha; - priority = Channel->priority; - rollOff = Channel->rollOff; -+ if (IsPlug()) pluginParam = strcpyrealloc(pluginParam, Channel->pluginParam); - } - } - -+bool cChannel::SetPlugTransponderData(int Source, int Frequency, const char *PluginParam) -+{ -+ if (source != Source || frequency != Frequency || (strcmp(pluginParam, PluginParam) != 0)) { -+ cString OldParameters = ParametersToString(); -+ source = Source; -+ frequency = Frequency; -+ pluginParam = strcpyrealloc(pluginParam, PluginParam); -+ schedule = NULL; -+ if (Number()) { -+ dsyslog("changing transponder data of channel %d from %s:%d:%s to %s:%d:%s", Number(), *OldParameters, frequency, pluginParam, *cSource::ToString(Source), Frequency, PluginParam); -+ modification |= CHANNELMOD_TRANSP; -+ Channels.SetModified(); -+ } -+ } -+ return true; -+} -+ - bool cChannel::SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH, int Modulation, int System, int RollOff) - { - // Workarounds for broadcaster stupidity: -@@ -472,6 +494,18 @@ - } - } - -+void cChannel::SetPluginParam(const char *PluginParam) -+{ -+ if (!isempty(PluginParam) && strcmp(pluginParam, PluginParam) != 0) { -+ if (Number()) { -+ dsyslog("changing plugin parameters of channel %d from '%s' to '%s'", Number(), pluginParam, PluginParam); -+ modification |= CHANNELMOD_TRANSP; -+ Channels.SetModified(); -+ } -+ pluginParam = strcpyrealloc(pluginParam, PluginParam); -+ } -+} -+ - #define STRDIFF 0x01 - #define VALDIFF 0x02 - -@@ -658,7 +692,7 @@ - if (isdigit(type)) - type = 'S'; - #define ST(s) if (strchr(s, type)) -- char buffer[64]; -+ char buffer[256]; - char *q = buffer; - *q = 0; - ST(" S ") q += sprintf(q, "%c", polarization); -@@ -674,6 +708,7 @@ - ST(" S ") q += PrintParameter(q, 'S', MapToUser(system, SystemValues)); - ST(" T") q += PrintParameter(q, 'T', MapToUser(transmission, TransmissionValues)); - ST(" T") q += PrintParameter(q, 'Y', MapToUser(hierarchy, HierarchyValues)); -+ ST("P ") snprintf(buffer, sizeof(buffer), "%s", pluginParam); - return buffer; - } - -@@ -695,7 +730,7 @@ - - bool cChannel::StringToParameters(const char *s) - { -- while (s && *s) { -+ while (s && *s && !IsPlug()) { - switch (toupper(*s)) { - case 'A': s = ParseParameter(s, alpha, AlphaValues); break; - case 'B': s = ParseParameter(s, bandwidth, BandwidthValues); break; -@@ -810,7 +845,7 @@ - dpids[0] = 0; - ok = false; - if (parambuf && sourcebuf && vpidbuf && apidbuf) { -- ok = StringToParameters(parambuf) && (source = cSource::FromString(sourcebuf)) >= 0; -+ ok = ((source = cSource::FromString(sourcebuf)) >= 0) && StringToParameters(parambuf); - - char *p = strchr(vpidbuf, '+'); - if (p) -@@ -901,6 +936,7 @@ - shortName = strcpyrealloc(shortName, p); - } - name = strcpyrealloc(name, namebuf); -+ if (IsPlug()) pluginParam = strcpyrealloc(pluginParam, parambuf); - - free(parambuf); - free(sourcebuf); -diff -Nru vdr-1.5.14-vanilla/channels.h vdr-1.5.14-pluginparam/channels.h ---- vdr-1.5.14-vanilla/channels.h 2008-01-27 23:04:26.000000000 +0200 -+++ vdr-1.5.14-pluginparam/channels.h 2008-01-28 23:32:58.000000000 +0200 -@@ -118,6 +118,7 @@ - char *shortName; - char *provider; - char *portalName; -+ char *pluginParam; - int __BeginData__; - int frequency; // MHz - int source; -@@ -173,6 +174,7 @@ - int Frequency(void) const { return frequency; } ///< Returns the actual frequency, as given in 'channels.conf' - int Transponder(void) const; ///< Returns the transponder frequency in MHz, plus the polarization in case of sat - static int Transponder(int Frequency, char Polarization); ///< builds the transponder from the given Frequency and Polarization -+ const char *PluginParam(void) const { return pluginParam; } - int Source(void) const { return source; } - int Srate(void) const { return srate; } - int Vpid(void) const { return vpid; } -@@ -211,6 +213,7 @@ - int RollOff(void) const { return rollOff; } - const cLinkChannels* LinkChannels(void) const { return linkChannels; } - const cChannel *RefChannel(void) const { return refChannel; } -+ bool IsPlug(void) const { return cSource::IsPlug(source); } - bool IsCable(void) const { return cSource::IsCable(source); } - bool IsSat(void) const { return cSource::IsSat(source); } - bool IsTerr(void) const { return cSource::IsTerr(source); } -@@ -218,12 +221,14 @@ - bool HasTimer(void) const; - int Modification(int Mask = CHANNELMOD_ALL); - void CopyTransponderData(const cChannel *Channel); -+ bool SetPlugTransponderData(int Source, int Frequency, const char *PluginParam); - bool SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH, int Modulation, int System, int RollOff); - bool SetCableTransponderData(int Source, int Frequency, int Modulation, int Srate, int CoderateH); - bool SetTerrTransponderData(int Source, int Frequency, int Bandwidth, int Modulation, int Hierarchy, int CodeRateH, int CodeRateL, int Guard, int Transmission, int Alpha, int Priority); - void SetId(int Nid, int Tid, int Sid, int Rid = 0); - void SetName(const char *Name, const char *ShortName, const char *Provider); - void SetPortalName(const char *PortalName); -+ void SetPluginParam(const char *PluginParam); - 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 SetCaDescriptors(int Level); -diff -Nru vdr-1.5.14-vanilla/config.h vdr-1.5.14-pluginparam/config.h ---- vdr-1.5.14-vanilla/config.h 2008-01-27 23:04:26.000000000 +0200 -+++ vdr-1.5.14-pluginparam/config.h 2008-01-28 23:32:58.000000000 +0200 -@@ -30,6 +30,8 @@ - #define APIVERSION "1.5.14" - #define APIVERSNUM 10514 // Version * 10000 + Major * 100 + Minor - -+#define PLUGINPARAMPATCHVERSNUM 1 -+ - // When loading plugins, VDR searches them by their APIVERSION, which - // 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.14-vanilla/menu.c vdr-1.5.14-pluginparam/menu.c ---- vdr-1.5.14-vanilla/menu.c 2008-01-27 23:04:26.000000000 +0200 -+++ vdr-1.5.14-pluginparam/menu.c 2008-01-28 23:32:58.000000000 +0200 -@@ -155,6 +155,7 @@ - cChannel *channel; - cChannel data; - char name[256]; -+ char pluginParam[256]; - void Setup(void); - public: - cMenuEditChannel(cChannel *Channel, bool New = false); -@@ -187,6 +188,7 @@ - - // Parameters for all types of sources: - strn0cpy(name, data.name, sizeof(name)); -+ strn0cpy(pluginParam, data.pluginParam, sizeof(pluginParam)); - Add(new cMenuEditStrItem( tr("Name"), name, sizeof(name))); - Add(new cMenuEditSrcItem( tr("Source"), &data.source)); - Add(new cMenuEditIntItem( tr("Frequency"), &data.frequency)); -@@ -221,6 +223,7 @@ - ST(" T") Add(new cMenuEditMapItem( tr("Alpha"), &data.alpha, AlphaValues)); - ST(" T") Add(new cMenuEditMapItem( tr("Priority"), &data.priority, PriorityValues)); - ST(" S ") Add(new cMenuEditMapItem( tr("Rolloff"), &data.rollOff, RollOffValues)); -+ ST("P ") Add(new cMenuEditStrItem( tr("Parameters"), pluginParam, sizeof(pluginParam), tr(FileNameChars))); - - SetCurrent(Get(current)); - Display(); -@@ -235,6 +238,7 @@ - if (Key == kOk) { - if (Channels.HasUniqueChannelID(&data, channel)) { - data.name = strcpyrealloc(data.name, name); -+ data.pluginParam = strcpyrealloc(data.pluginParam, pluginParam); - if (channel) { - *channel = data; - isyslog("edited channel %d %s", channel->Number(), *data.ToText()); -diff -Nru vdr-1.5.14-vanilla/po/fi_FI.po vdr-1.5.14-pluginparam/po/fi_FI.po ---- vdr-1.5.14-vanilla/po/fi_FI.po 2008-01-27 23:04:26.000000000 +0200 -+++ vdr-1.5.14-pluginparam/po/fi_FI.po 2008-01-28 23:32:58.000000000 +0200 -@@ -1019,3 +1019,6 @@ - #, c-format - msgid "VDR will shut down in %s minutes" - msgstr "VDR sammuu %s minuutin kuluttua" -+ -+msgid "Parameters" -+msgstr "Parametrit" -diff -Nru vdr-1.5.14-vanilla/po/fr_FR.po vdr-1.5.14-pluginparam/po/fr_FR.po ---- vdr-1.5.14-vanilla/po/fr_FR.po 2008-01-27 23:04:26.000000000 +0200 -+++ vdr-1.5.14-pluginparam/po/fr_FR.po 2008-01-28 23:32:58.000000000 +0200 -@@ -1022,3 +1022,6 @@ - #, c-format - msgid "VDR will shut down in %s minutes" - msgstr "VDR s'arrêtera dans %s minutes" -+ -+msgid "Parameters" -+msgstr "Paramètres" -diff -Nru vdr-1.5.14-vanilla/sources.c vdr-1.5.14-pluginparam/sources.c ---- vdr-1.5.14-vanilla/sources.c 2008-01-27 23:04:26.000000000 +0200 -+++ vdr-1.5.14-pluginparam/sources.c 2008-01-28 23:32:58.000000000 +0200 -@@ -37,6 +37,7 @@ - char buffer[16]; - char *q = buffer; - switch (Code & st_Mask) { -+ case stPlug: *q++ = 'P'; break; - case stCable: *q++ = 'C'; break; - case stSat: *q++ = 'S'; - { -@@ -56,6 +57,7 @@ - { - int type = stNone; - switch (toupper(*s)) { -+ case 'P': type = stPlug; break; - case 'C': type = stCable; break; - case 'S': type = stSat; break; - case 'T': type = stTerr; break; -diff -Nru vdr-1.5.14-vanilla/sources.conf vdr-1.5.14-pluginparam/sources.conf ---- vdr-1.5.14-vanilla/sources.conf 2008-01-27 23:04:26.000000000 +0200 -+++ vdr-1.5.14-pluginparam/sources.conf 2008-01-28 23:32:58.000000000 +0200 -@@ -188,3 +188,7 @@ - # Terrestrial - - T Terrestrial -+ -+# Plugin -+ -+P Plugin -diff -Nru vdr-1.5.14-vanilla/sources.h vdr-1.5.14-pluginparam/sources.h ---- vdr-1.5.14-vanilla/sources.h 2008-01-27 23:04:26.000000000 +0200 -+++ vdr-1.5.14-pluginparam/sources.h 2008-01-28 23:32:58.000000000 +0200 -@@ -16,10 +16,11 @@ - public: - enum eSourceType { - stNone = 0x0000, -+ stPlug = 0x2000, - stCable = 0x4000, - stSat = 0x8000, - stTerr = 0xC000, -- st_Mask = 0xC000, -+ st_Mask = 0xE000, - st_Neg = 0x0800, - st_Pos = 0x07FF, - }; -@@ -35,6 +36,7 @@ - static cString ToString(int Code); - static int FromString(const char *s); - static int FromData(eSourceType SourceType, int Position = 0, bool East = false); -+ static bool IsPlug(int Code) { return (Code & st_Mask) == stPlug; } - static bool IsCable(int Code) { return (Code & st_Mask) == stCable; } - static bool IsSat(int Code) { return (Code & st_Mask) == stSat; } - static bool IsTerr(int Code) { return (Code & st_Mask) == stTerr; }