diff options
Diffstat (limited to 'media-plugins/vdr-radioinfo/files/vdr-radioinfo-0.0.3-vdr-1.5.0.diff')
| -rw-r--r-- | media-plugins/vdr-radioinfo/files/vdr-radioinfo-0.0.3-vdr-1.5.0.diff | 206 |
1 files changed, 0 insertions, 206 deletions
diff --git a/media-plugins/vdr-radioinfo/files/vdr-radioinfo-0.0.3-vdr-1.5.0.diff b/media-plugins/vdr-radioinfo/files/vdr-radioinfo-0.0.3-vdr-1.5.0.diff deleted file mode 100644 index bd2b66c..0000000 --- a/media-plugins/vdr-radioinfo/files/vdr-radioinfo-0.0.3-vdr-1.5.0.diff +++ /dev/null @@ -1,206 +0,0 @@ -diff -Naur radioinfo-0.0.3.orig/HISTORY radioinfo-0.0.3/HISTORY ---- radioinfo-0.0.3.orig/HISTORY 2006-06-29 15:08:07.000000000 -0400 -+++ radioinfo-0.0.3/HISTORY 2007-01-15 08:55:20.000000000 -0500 -@@ -25,3 +25,10 @@ - than direct user input - - Fixed some problems that occur when debug messages are turned off - - Changed default OSD update time to 2 seconds -+ -+ -+2007-01-15: Version 0.0.4 -+ -+- Cleaned up device handling -+- Now works with VDR 1.5.0 -+ -diff -Naur radioinfo-0.0.3.orig/radioinfo.c radioinfo-0.0.3/radioinfo.c ---- radioinfo-0.0.3.orig/radioinfo.c 2006-06-29 14:56:03.000000000 -0400 -+++ radioinfo-0.0.3/radioinfo.c 2007-01-15 09:26:19.000000000 -0500 -@@ -21,7 +21,7 @@ - #include "radioInfoSetupMenu.h" - - --static const char *VERSION = "0.0.3"; -+static const char *VERSION = "0.0.4"; - static const char *DESCRIPTION = "Provides extra information for radio channels"; - static const char *MAINMENUENTRY = NULL; - -@@ -32,10 +32,12 @@ - // DON'T DO ANYTHING ELSE THAT MAY HAVE SIDE EFFECTS, REQUIRE GLOBAL - // VDR OBJECTS TO EXIST OR PRODUCE ANY OUTPUT! - //radioInfoMonitor = NULL; -- radioInfoOsd = NULL; -+ radioInfoOsd = NULL; - radioInfoReceiver = NULL; -- radioInfoFilter = NULL; -+ radioInfoFilter = NULL; - -+ currentChannel = NULL; -+ currentDevice = NULL; - radioInfo = new sRadioInfo; - radioInfo->updating = true; - -@@ -173,10 +175,14 @@ - // Is it a radio channel? - if (chan && chan->Vpid() == 0 && chan->Apid(0) != 0) - { -+ currentChannel = (cChannel*) chan; -+ currentDevice = (cDevice*) Device; -+ -+ - resetInfo(); - - // Find Info PID -- radioInfoFilter->Attach(); -+ radioInfoFilter->Attach(currentDevice); - - // Ready for OSD - wantsOsd = true; -@@ -196,6 +202,9 @@ - if (radioInfoReceiver) { - radioInfoReceiver->Detach(); - } -+ -+ currentChannel = NULL; -+ currentDevice = NULL; - } - - } -@@ -238,19 +247,11 @@ - if (Pid != -1) - { - // Start receiving data from info PID -- cChannel* c = Channels.GetByNumber(cDevice::CurrentChannel()); -- if (c) -- { -- if (radioInfoReceiver) { DEBUG_MSG("Receiver already exits; this shoudn't happen!"); } -- -- radioInfoReceiver = new cRadioInfoReceiver(Pid, c->Ca(), radioInfo); -- -- radioInfoReceiver->Attach(); -- } -- else { -- DEBUG_MSG("ERROR Got NULL Channel!"); -- } -- } -+ -+ if (radioInfoReceiver) { DEBUG_MSG("Receiver already exits; this shoudn't happen!"); } -+ radioInfoReceiver = new cRadioInfoReceiver(Pid, currentChannel->GetChannelID(), radioInfo); -+ radioInfoReceiver->Attach(currentDevice); -+ } - - else // No PID found - { -@@ -276,21 +277,6 @@ - } - - --cDevice* cPluginRadioinfo::getDevice(void) --{ -- cChannel* c = Channels.GetByNumber(cDevice::CurrentChannel()); -- if (c) { -- return cDevice::GetDevice(c, 0); -- } -- else -- { -- //TODO: Can we do something better here? -- return cDevice::ActualDevice(); -- } --} -- -- -- - sRadioInfoConfig config; - - -diff -Naur radioinfo-0.0.3.orig/radioInfoFilter.c radioinfo-0.0.3/radioInfoFilter.c ---- radioinfo-0.0.3.orig/radioInfoFilter.c 2006-05-21 00:26:26.000000000 -0400 -+++ radioinfo-0.0.3/radioInfoFilter.c 2007-01-15 09:05:42.000000000 -0500 -@@ -34,11 +34,11 @@ - } - - --void cRadioInfoFilter::Attach(void) -+void cRadioInfoFilter::Attach(cDevice* device) - { - if (!attachedDevice) - { -- attachedDevice = cPluginRadioinfo::getDevice(); -+attachedDevice = device; - if (attachedDevice) - { - attachedDevice->AttachFilter(this); -diff -Naur radioinfo-0.0.3.orig/radioInfoFilter.h radioinfo-0.0.3/radioInfoFilter.h ---- radioinfo-0.0.3.orig/radioInfoFilter.h 2006-05-20 13:58:11.000000000 -0400 -+++ radioinfo-0.0.3/radioInfoFilter.h 2007-01-15 09:07:13.000000000 -0500 -@@ -17,7 +17,7 @@ - public: - cRadioInfoFilter(); - -- void Attach(void); -+ void Attach(cDevice* device); - void Detach(void); - - protected: -diff -Naur radioinfo-0.0.3.orig/radioinfo.h radioinfo-0.0.3/radioinfo.h ---- radioinfo-0.0.3.orig/radioinfo.h 2006-05-21 14:27:18.000000000 -0400 -+++ radioinfo-0.0.3/radioinfo.h 2007-01-15 09:08:43.000000000 -0500 -@@ -30,8 +30,8 @@ - - - bool wantsOsd; -- -- -+ cChannel* currentChannel; -+ cDevice* currentDevice; - - public: - cPluginRadioinfo(void); -@@ -53,7 +53,6 @@ - virtual cString SVDRPCommand(const char *Command, const char *Option, int &ReplyCode); - - void foundInfoPid(int Pid); -- static cDevice* getDevice(void); - - protected: - virtual void ChannelSwitch(const cDevice* Device, int ChannelNumber); -diff -Naur radioinfo-0.0.3.orig/radioInfoReceiver.c radioinfo-0.0.3/radioInfoReceiver.c ---- radioinfo-0.0.3.orig/radioInfoReceiver.c 2006-05-23 19:38:08.000000000 -0400 -+++ radioinfo-0.0.3/radioInfoReceiver.c 2007-01-15 09:12:00.000000000 -0500 -@@ -8,7 +8,7 @@ - - - --cRadioInfoReceiver::cRadioInfoReceiver(int Pid, int Ca, sRadioInfo* Ri) : cReceiver(Ca, -1, Pid) -+cRadioInfoReceiver::cRadioInfoReceiver(int Pid, tChannelID ChannelID, sRadioInfo* Ri) : cReceiver(ChannelID, -1, Pid) - { - DEBUG_MSG("RadioInfoReceiver Created."); - radioInfo = Ri; -@@ -18,11 +18,11 @@ - } - - --void cRadioInfoReceiver::Attach(void) -+void cRadioInfoReceiver::Attach(cDevice* device) - { - if (!attachedDevice) - { -- attachedDevice = cPluginRadioinfo::getDevice(); -+ attachedDevice = device; - if (attachedDevice) - { - attachedDevice->AttachReceiver(this); -diff -Naur radioinfo-0.0.3.orig/radioInfoReceiver.h radioinfo-0.0.3/radioInfoReceiver.h ---- radioinfo-0.0.3.orig/radioInfoReceiver.h 2006-05-20 13:58:07.000000000 -0400 -+++ radioinfo-0.0.3/radioInfoReceiver.h 2007-01-15 09:13:31.000000000 -0500 -@@ -15,9 +15,8 @@ - cDevice* attachedDevice; - - public: -- cRadioInfoReceiver(int Pid, int Ca, sRadioInfo* Ri); -- -- void Attach(void); -+ cRadioInfoReceiver(int Pid, tChannelID ChannelID, sRadioInfo* Ri); -+ void Attach(cDevice* device); - void Detach(void); - - protected: |