From 78048d8ea09ea30b8fea7255775130abcab5d021 Mon Sep 17 00:00:00 2001 From: Rolf Ahrenberg Date: Mon, 8 Jan 2007 04:20:00 +0200 Subject: [PATCH] Updated for vdr-1.5.0. --- HISTORY | 4 ++++ femon.h | 2 +- femonclient/vdr-femonclient-0.0.1.tgz | Bin 8916 -> 0 bytes femonclient/vdr-femonclient-0.0.2.tgz | Bin 0 -> 8944 bytes femonosd.c | 10 +++++++--- femonreceiver.c | 6 +++++- femonreceiver.h | 2 +- 7 files changed, 18 insertions(+), 6 deletions(-) delete mode 100644 femonclient/vdr-femonclient-0.0.1.tgz create mode 100644 femonclient/vdr-femonclient-0.0.2.tgz diff --git a/HISTORY b/HISTORY index 96c1884..78e37cd 100644 --- a/HISTORY +++ b/HISTORY @@ -240,3 +240,7 @@ VDR Plugin 'femon' Revision History - Added INFO SVDRP command (partially based on patch by Herbert Pötzl). - Removed system log option - use SVDRP instead. - Added --remove-destination to the 'cp' command in Makefile. + +2007-01-08: Version 1.1.1 + +- Updated for vdr-1.5.0. diff --git a/femon.h b/femon.h index 840beff..b365036 100644 --- a/femon.h +++ b/femon.h @@ -11,7 +11,7 @@ #include -static const char VERSION[] = "1.1.0"; +static const char VERSION[] = "1.1.1"; static const char DESCRIPTION[] = "DVB Signal Information Monitor (OSD)"; static const char MAINMENUENTRY[] = "Signal Information"; diff --git a/femonclient/vdr-femonclient-0.0.1.tgz b/femonclient/vdr-femonclient-0.0.1.tgz deleted file mode 100644 index 940640d3b54681ecc659fc97c177cd9e3782c685..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8916 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 K;*^a5cmM#pvTVix literal 0 HcmV?d00001 diff --git a/femonosd.c b/femonosd.c index 36f063d..99155a9 100644 --- a/femonosd.c +++ b/femonosd.c @@ -602,7 +602,7 @@ void cFemonOsd::Show(void) cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel()); IS_AUDIO_TRACK(track) ? apid[0] = channel->Apid(int(track - ttAudioFirst)) : apid[0] = channel->Apid(0); IS_DOLBY_TRACK(track) ? dpid[0] = channel->Dpid(int(track - ttDolbyFirst)) : dpid[0] = channel->Dpid(0); - m_Receiver = new cFemonReceiver(channel->Ca(), channel->Vpid(), apid, dpid); + m_Receiver = new cFemonReceiver(channel->GetChannelID(), channel->Ca(), channel->Vpid(), apid, dpid); cDevice::ActualDevice()->AttachReceiver(m_Receiver); } Start(); @@ -645,7 +645,7 @@ void cFemonOsd::ChannelSwitch(const cDevice * device, int channelNumber) cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel()); IS_AUDIO_TRACK(track) ? apid[0] = channel->Apid(int(track - ttAudioFirst)) : apid[0] = channel->Apid(0); IS_DOLBY_TRACK(track) ? dpid[0] = channel->Dpid(int(track - ttDolbyFirst)) : dpid[0] = channel->Dpid(0); - m_Receiver = new cFemonReceiver(channel->Ca(), channel->Vpid(), apid, dpid); + m_Receiver = new cFemonReceiver(channel->GetChannelID(), channel->Ca(), channel->Vpid(), apid, dpid); cDevice::ActualDevice()->AttachReceiver(m_Receiver); } } @@ -662,7 +662,7 @@ void cFemonOsd::SetAudioTrack(int Index, const char * const *Tracks) cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel()); IS_AUDIO_TRACK(track) ? apid[0] = channel->Apid(int(track - ttAudioFirst)) : apid[0] = channel->Apid(0); IS_DOLBY_TRACK(track) ? dpid[0] = channel->Dpid(int(track - ttDolbyFirst)) : dpid[0] = channel->Dpid(0); - m_Receiver = new cFemonReceiver(channel->Ca(), channel->Vpid(), apid, dpid); + m_Receiver = new cFemonReceiver(channel->GetChannelID(), channel->Ca(), channel->Vpid(), apid, dpid); cDevice::ActualDevice()->AttachReceiver(m_Receiver); } } @@ -690,7 +690,11 @@ bool cFemonOsd::DeviceSwitch(int direction) cDevice::GetDevice(device)->SwitchChannel(channel, true); if (cDevice::GetDevice(device) == cDevice::PrimaryDevice()) cDevice::GetDevice(device)->ForceTransferMode(); +#if defined(APIVERSNUM) && APIVERSNUM < 10500 cControl::Launch(new cTransferControl(cDevice::GetDevice(device), channel->Vpid(), channel->Apids(), channel->Dpids(), channel->Spids())); +#else + cControl::Launch(new cTransferControl(cDevice::GetDevice(device), channel->GetChannelID(), channel->Vpid(), channel->Apids(), channel->Dpids(), channel->Spids())); +#endif cStatus::MsgChannelSwitch(cDevice::PrimaryDevice(), channel->Number()); return (true); } diff --git a/femonreceiver.c b/femonreceiver.c index 860fed3..ee67b52 100644 --- a/femonreceiver.c +++ b/femonreceiver.c @@ -17,8 +17,12 @@ #define PAYLOAD 0x10 #define PTS_DTS_FLAGS 0xC0 -cFemonReceiver::cFemonReceiver(int Ca, int Vpid, int Apid[], int Dpid[]) +cFemonReceiver::cFemonReceiver(tChannelID ChannelID, int Ca, int Vpid, int Apid[], int Dpid[]) +#if defined(APIVERSNUM) && APIVERSNUM < 10500 :cReceiver(Ca, -1, Vpid, Apid, Dpid, NULL), cThread("femon receiver") +#else +:cReceiver(ChannelID, -1, Vpid, Apid, Dpid, NULL), cThread("femon receiver") +#endif { Dprintf("%s()\n", __PRETTY_FUNCTION__); m_VideoPid = Vpid; diff --git a/femonreceiver.h b/femonreceiver.h index 068ff54..0eb4620 100644 --- a/femonreceiver.h +++ b/femonreceiver.h @@ -96,7 +96,7 @@ protected: virtual void Action(void); public: - cFemonReceiver(int Ca, int Vpid, int Apid[], int Dpid[]); + cFemonReceiver(tChannelID ChannelID, int Ca, int Vpid, int Apid[], int Dpid[]); virtual ~cFemonReceiver(); bool VideoValid(void) { return m_VideoValid; }; // boolean