mirror of
https://github.com/rofafor/vdr-plugin-iptv.git
synced 2023-10-10 11:37:03 +00:00
Modified for vdr-1.5.10.
This commit is contained in:
Rolf Ahrenberg
@@ -1,6 +1,6 @@
|
||||
diff -Nru vdr-1.5.9-vanilla/channels.c vdr-1.5.9-pluginparam/channels.c
|
||||
--- vdr-1.5.9-vanilla/channels.c 2007-08-26 18:45:20.000000000 +0300
|
||||
+++ vdr-1.5.9-pluginparam/channels.c 2007-10-07 19:54:06.000000000 +0300
|
||||
diff -Nru vdr-1.5.10-vanilla/channels.c vdr-1.5.10-pluginparam/channels.c
|
||||
--- vdr-1.5.10-vanilla/channels.c 2007-10-14 18:21:57.000000000 +0300
|
||||
+++ vdr-1.5.10-pluginparam/channels.c 2007-10-14 20:31:12.000000000 +0300
|
||||
@@ -166,6 +166,7 @@
|
||||
shortName = strdup("");
|
||||
provider = strdup("");
|
||||
@@ -79,7 +79,7 @@ diff -Nru vdr-1.5.9-vanilla/channels.c vdr-1.5.9-pluginparam/channels.c
|
||||
#define STRDIFF 0x01
|
||||
#define VALDIFF 0x02
|
||||
|
||||
@@ -579,7 +612,7 @@
|
||||
@@ -593,7 +626,7 @@
|
||||
if (isdigit(type))
|
||||
type = 'S';
|
||||
#define ST(s) if (strchr(s, type))
|
||||
@@ -88,7 +88,7 @@ diff -Nru vdr-1.5.9-vanilla/channels.c vdr-1.5.9-pluginparam/channels.c
|
||||
char *q = buffer;
|
||||
*q = 0;
|
||||
ST(" S ") q += sprintf(q, "%c", polarization);
|
||||
@@ -591,6 +624,7 @@
|
||||
@@ -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));
|
||||
@@ -96,7 +96,7 @@ diff -Nru vdr-1.5.9-vanilla/channels.c vdr-1.5.9-pluginparam/channels.c
|
||||
return buffer;
|
||||
}
|
||||
|
||||
@@ -612,7 +646,7 @@
|
||||
@@ -626,7 +660,7 @@
|
||||
|
||||
bool cChannel::StringToParameters(const char *s)
|
||||
{
|
||||
@@ -105,7 +105,7 @@ diff -Nru vdr-1.5.9-vanilla/channels.c vdr-1.5.9-pluginparam/channels.c
|
||||
switch (toupper(*s)) {
|
||||
case 'B': s = ParseParameter(s, bandwidth, BandwidthValues); break;
|
||||
case 'C': s = ParseParameter(s, coderateH, CoderateValues); break;
|
||||
@@ -722,7 +756,7 @@
|
||||
@@ -736,7 +770,7 @@
|
||||
dpids[0] = 0;
|
||||
ok = false;
|
||||
if (parambuf && sourcebuf && vpidbuf && apidbuf) {
|
||||
@@ -114,7 +114,7 @@ diff -Nru vdr-1.5.9-vanilla/channels.c vdr-1.5.9-pluginparam/channels.c
|
||||
|
||||
char *p = strchr(vpidbuf, '+');
|
||||
if (p)
|
||||
@@ -813,6 +847,7 @@
|
||||
@@ -827,6 +861,7 @@
|
||||
shortName = strcpyrealloc(shortName, p);
|
||||
}
|
||||
name = strcpyrealloc(name, namebuf);
|
||||
@@ -122,9 +122,9 @@ diff -Nru vdr-1.5.9-vanilla/channels.c vdr-1.5.9-pluginparam/channels.c
|
||||
|
||||
free(parambuf);
|
||||
free(sourcebuf);
|
||||
diff -Nru vdr-1.5.9-vanilla/channels.h vdr-1.5.9-pluginparam/channels.h
|
||||
--- vdr-1.5.9-vanilla/channels.h 2007-08-26 18:45:20.000000000 +0300
|
||||
+++ vdr-1.5.9-pluginparam/channels.h 2007-10-07 19:54:06.000000000 +0300
|
||||
diff -Nru vdr-1.5.10-vanilla/channels.h vdr-1.5.10-pluginparam/channels.h
|
||||
--- vdr-1.5.10-vanilla/channels.h 2007-10-14 18:21:57.000000000 +0300
|
||||
+++ vdr-1.5.10-pluginparam/channels.h 2007-10-14 20:32:16.000000000 +0300
|
||||
@@ -114,6 +114,7 @@
|
||||
char *shortName;
|
||||
char *provider;
|
||||
@@ -161,12 +161,12 @@ diff -Nru vdr-1.5.9-vanilla/channels.h vdr-1.5.9-pluginparam/channels.h
|
||||
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 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.9-vanilla/menu.c vdr-1.5.9-pluginparam/menu.c
|
||||
--- vdr-1.5.9-vanilla/menu.c 2007-08-26 18:45:20.000000000 +0300
|
||||
+++ vdr-1.5.9-pluginparam/menu.c 2007-10-07 19:54:06.000000000 +0300
|
||||
diff -Nru vdr-1.5.10-vanilla/menu.c vdr-1.5.10-pluginparam/menu.c
|
||||
--- vdr-1.5.10-vanilla/menu.c 2007-10-14 18:21:57.000000000 +0300
|
||||
+++ vdr-1.5.10-pluginparam/menu.c 2007-10-14 20:31:12.000000000 +0300
|
||||
@@ -219,6 +219,7 @@
|
||||
cChannel *channel;
|
||||
cChannel data;
|
||||
@@ -183,7 +183,7 @@ diff -Nru vdr-1.5.9-vanilla/menu.c vdr-1.5.9-pluginparam/menu.c
|
||||
Add(new cMenuEditStrItem( tr("Name"), name, sizeof(name), tr(FileNameChars)));
|
||||
Add(new cMenuEditSrcItem( tr("Source"), &data.source));
|
||||
Add(new cMenuEditIntItem( tr("Frequency"), &data.frequency));
|
||||
@@ -279,6 +281,7 @@
|
||||
@@ -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")));
|
||||
@@ -191,7 +191,7 @@ diff -Nru vdr-1.5.9-vanilla/menu.c vdr-1.5.9-pluginparam/menu.c
|
||||
|
||||
SetCurrent(Get(current));
|
||||
Display();
|
||||
@@ -293,6 +296,7 @@
|
||||
@@ -295,6 +298,7 @@
|
||||
if (Key == kOk) {
|
||||
if (Channels.HasUniqueChannelID(&data, channel)) {
|
||||
data.name = strcpyrealloc(data.name, name);
|
||||
@@ -199,20 +199,19 @@ diff -Nru vdr-1.5.9-vanilla/menu.c vdr-1.5.9-pluginparam/menu.c
|
||||
if (channel) {
|
||||
*channel = data;
|
||||
isyslog("edited channel %d %s", channel->Number(), *data.ToText());
|
||||
diff -Nru vdr-1.5.9-vanilla/po/fi_FI.po vdr-1.5.9-pluginparam/po/fi_FI.po
|
||||
--- vdr-1.5.9-vanilla/po/fi_FI.po 2007-08-26 18:45:20.000000000 +0300
|
||||
+++ vdr-1.5.9-pluginparam/po/fi_FI.po 2007-10-07 19:54:06.000000000 +0300
|
||||
@@ -1271,3 +1271,7 @@
|
||||
diff -Nru vdr-1.5.10-vanilla/po/fi_FI.po vdr-1.5.10-pluginparam/po/fi_FI.po
|
||||
--- vdr-1.5.10-vanilla/po/fi_FI.po 2007-10-14 18:21:57.000000000 +0300
|
||||
+++ vdr-1.5.10-pluginparam/po/fi_FI.po 2007-10-14 20:34:41.000000000 +0300
|
||||
@@ -998,3 +998,6 @@
|
||||
#, c-format
|
||||
msgid "VDR will shut down in %s minutes"
|
||||
msgstr "VDR sammuu %s minuutin kuluttua"
|
||||
+
|
||||
+#: menu.c:284
|
||||
+msgid "Parameters"
|
||||
+msgstr "Parametrit"
|
||||
diff -Nru vdr-1.5.9-vanilla/sources.c vdr-1.5.9-pluginparam/sources.c
|
||||
--- vdr-1.5.9-vanilla/sources.c 2007-08-26 18:45:20.000000000 +0300
|
||||
+++ vdr-1.5.9-pluginparam/sources.c 2007-10-07 19:54:06.000000000 +0300
|
||||
diff -Nru vdr-1.5.10-vanilla/sources.c vdr-1.5.10-pluginparam/sources.c
|
||||
--- vdr-1.5.10-vanilla/sources.c 2007-10-14 18:21:57.000000000 +0300
|
||||
+++ vdr-1.5.10-pluginparam/sources.c 2007-10-14 20:31:12.000000000 +0300
|
||||
@@ -37,6 +37,7 @@
|
||||
char buffer[16];
|
||||
char *q = buffer;
|
||||
@@ -229,9 +228,9 @@ diff -Nru vdr-1.5.9-vanilla/sources.c vdr-1.5.9-pluginparam/sources.c
|
||||
case 'C': type = stCable; break;
|
||||
case 'S': type = stSat; break;
|
||||
case 'T': type = stTerr; break;
|
||||
diff -Nru vdr-1.5.9-vanilla/sources.conf vdr-1.5.9-pluginparam/sources.conf
|
||||
--- vdr-1.5.9-vanilla/sources.conf 2007-08-26 18:45:20.000000000 +0300
|
||||
+++ vdr-1.5.9-pluginparam/sources.conf 2007-10-07 19:54:06.000000000 +0300
|
||||
diff -Nru vdr-1.5.10-vanilla/sources.conf vdr-1.5.10-pluginparam/sources.conf
|
||||
--- vdr-1.5.10-vanilla/sources.conf 2007-10-14 18:21:57.000000000 +0300
|
||||
+++ vdr-1.5.10-pluginparam/sources.conf 2007-10-14 20:31:12.000000000 +0300
|
||||
@@ -188,3 +188,7 @@
|
||||
# Terrestrial
|
||||
|
||||
@@ -240,9 +239,9 @@ diff -Nru vdr-1.5.9-vanilla/sources.conf vdr-1.5.9-pluginparam/sources.conf
|
||||
+# Plugin
|
||||
+
|
||||
+P Plugin
|
||||
diff -Nru vdr-1.5.9-vanilla/sources.h vdr-1.5.9-pluginparam/sources.h
|
||||
--- vdr-1.5.9-vanilla/sources.h 2007-08-26 18:45:20.000000000 +0300
|
||||
+++ vdr-1.5.9-pluginparam/sources.h 2007-10-07 19:54:06.000000000 +0300
|
||||
diff -Nru vdr-1.5.10-vanilla/sources.h vdr-1.5.10-pluginparam/sources.h
|
||||
--- vdr-1.5.10-vanilla/sources.h 2007-10-14 18:21:57.000000000 +0300
|
||||
+++ vdr-1.5.10-pluginparam/sources.h 2007-10-14 20:31:12.000000000 +0300
|
||||
@@ -16,10 +16,11 @@
|
||||
public:
|
||||
enum eSourceType {
|
||||
@@ -1,105 +0,0 @@
|
||||
diff -Nru vdr-1.5.9-vanilla/PLUGINS.html vdr-1.5.9-closefilter/PLUGINS.html
|
||||
--- vdr-1.5.9-vanilla/PLUGINS.html 2007-08-24 16:45:02.000000000 +0300
|
||||
+++ vdr-1.5.9-closefilter/PLUGINS.html 2007-09-28 17:57:47.484049900 +0300
|
||||
@@ -1778,7 +1778,7 @@
|
||||
<p><table><tr><td bgcolor=#F0F0F0><pre>
|
||||
virtual bool ProvidesSource(int Source) const;
|
||||
virtual bool ProvidesTransponder(const cChannel *Channel) const;
|
||||
-virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL);
|
||||
+virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL) const;
|
||||
virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
|
||||
</pre></td></tr></table><p>
|
||||
|
||||
@@ -1838,7 +1838,7 @@
|
||||
functionality:
|
||||
|
||||
<p><table><tr><td bgcolor=#F0F0F0><pre>
|
||||
-virtual bool GrabImage(const char *FileName, bool Jpeg = true, int Quality = -1, int Si
|
||||
+virtual bool GrabImage(const char *FileName, bool Jpeg = true, int Quality = -1, int SizeX = -1, int SizeY = -1);
|
||||
virtual void SetVideoFormat(bool VideoFormat16_9);
|
||||
virtual void SetVolumeDevice(int Volume);
|
||||
</pre></td></tr></table><p>
|
||||
@@ -1846,14 +1846,15 @@
|
||||
<p>
|
||||
<b>Section Filtering</b>
|
||||
<p>
|
||||
-If your device provides section filtering capabilities it can implement
|
||||
-the function
|
||||
+If your device provides section filtering capabilities it can implement
|
||||
+functions
|
||||
|
||||
<p><table><tr><td bgcolor=#F0F0F0><pre>
|
||||
virtual int OpenFilter(u_short Pid, u_char Tid, u_char Mask);
|
||||
+virtual bool CloseFilter(int Handle);
|
||||
</pre></td></tr></table><p>
|
||||
|
||||
-which must open a file handle that delivers section data for the given
|
||||
+which must open and close a file handle that delivers section data for the given
|
||||
filter parameters.
|
||||
<p>
|
||||
In order to actually start section handling, the
|
||||
diff -Nru vdr-1.5.9-vanilla/device.c vdr-1.5.9-closefilter/device.c
|
||||
--- vdr-1.5.9-vanilla/device.c 2007-08-26 14:11:42.000000000 +0300
|
||||
+++ vdr-1.5.9-closefilter/device.c 2007-09-28 17:53:49.734049900 +0300
|
||||
@@ -576,6 +576,11 @@
|
||||
return -1;
|
||||
}
|
||||
|
||||
+bool cDevice::CloseFilter(int Handle)
|
||||
+{
|
||||
+ return false;
|
||||
+}
|
||||
+
|
||||
void cDevice::AttachFilter(cFilter *Filter)
|
||||
{
|
||||
if (sectionHandler)
|
||||
diff -Nru vdr-1.5.9-vanilla/device.h vdr-1.5.9-closefilter/device.h
|
||||
--- vdr-1.5.9-vanilla/device.h 2007-07-22 14:20:13.000000000 +0300
|
||||
+++ vdr-1.5.9-closefilter/device.h 2007-09-28 17:53:49.749674900 +0300
|
||||
@@ -303,6 +303,8 @@
|
||||
///< Opens a file handle for the given filter data.
|
||||
///< A derived device that provides section data must
|
||||
///< implement this function.
|
||||
+ virtual bool CloseFilter(int Handle);
|
||||
+ ///< Closes a file handle
|
||||
void AttachFilter(cFilter *Filter);
|
||||
///< Attaches the given filter to this device.
|
||||
void Detach(cFilter *Filter);
|
||||
diff -Nru vdr-1.5.9-vanilla/dvbdevice.c vdr-1.5.9-closefilter/dvbdevice.c
|
||||
--- vdr-1.5.9-vanilla/dvbdevice.c 2007-08-17 16:37:56.000000000 +0300
|
||||
+++ vdr-1.5.9-closefilter/dvbdevice.c 2007-09-28 17:53:49.765299900 +0300
|
||||
@@ -711,6 +711,11 @@
|
||||
return -1;
|
||||
}
|
||||
|
||||
+bool cDvbDevice::CloseFilter(int Handle)
|
||||
+{
|
||||
+ return (close(Handle) == 0);
|
||||
+}
|
||||
+
|
||||
void cDvbDevice::TurnOffLiveMode(bool LiveView)
|
||||
{
|
||||
if (LiveView) {
|
||||
diff -Nru vdr-1.5.9-vanilla/dvbdevice.h vdr-1.5.9-closefilter/dvbdevice.h
|
||||
--- vdr-1.5.9-vanilla/dvbdevice.h 2007-02-25 14:23:57.000000000 +0200
|
||||
+++ vdr-1.5.9-closefilter/dvbdevice.h 2007-09-28 17:53:49.765299900 +0300
|
||||
@@ -83,6 +83,7 @@
|
||||
|
||||
protected:
|
||||
virtual int OpenFilter(u_short Pid, u_char Tid, u_char Mask);
|
||||
+ virtual bool CloseFilter(int Handle);
|
||||
|
||||
// Common Interface facilities:
|
||||
|
||||
diff -Nru vdr-1.5.9-vanilla/sections.c vdr-1.5.9-closefilter/sections.c
|
||||
--- vdr-1.5.9-vanilla/sections.c 2005-09-18 14:30:29.000000000 +0300
|
||||
+++ vdr-1.5.9-closefilter/sections.c 2007-09-28 17:53:49.780924900 +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;
|
||||
}
|
||||
Reference in New Issue
Block a user