diff options
| author | Frank Schmirler <vdr@schmirler.de> | 2011-09-09 23:26:45 +0200 |
|---|---|---|
| committer | Frank Schmirler <vdr@schmirler.de> | 2011-09-09 23:26:45 +0200 |
| commit | 4c0888d483b935977ca62755b5c30135a39e91e8 (patch) | |
| tree | 966e0210f718e730e60d0fc42d6070145e83f6c8 /server | |
| parent | 24a1638dddc5fd3d8c72ca75cdeda016910f2bf9 (diff) | |
| download | vdr-plugin-streamdev-4c0888d483b935977ca62755b5c30135a39e91e8.tar.gz vdr-plugin-streamdev-4c0888d483b935977ca62755b5c30135a39e91e8.tar.bz2 | |
adaption to VDR 1.7.12 cReceiver API change
Diffstat (limited to 'server')
| -rw-r--r-- | server/livestreamer.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/server/livestreamer.c b/server/livestreamer.c index 144f353..b46c9c7 100644 --- a/server/livestreamer.c +++ b/server/livestreamer.c @@ -29,15 +29,24 @@ protected: virtual void Receive(uchar *Data, int Length); public: - cStreamdevLiveReceiver(cStreamdevStreamer *Streamer, tChannelID ChannelID, int Priority, const int *Pids); + cStreamdevLiveReceiver(cStreamdevStreamer *Streamer, const cChannel *Channel, int Priority, const int *Pids); virtual ~cStreamdevLiveReceiver(); }; -cStreamdevLiveReceiver::cStreamdevLiveReceiver(cStreamdevStreamer *Streamer, tChannelID ChannelID, +cStreamdevLiveReceiver::cStreamdevLiveReceiver(cStreamdevStreamer *Streamer, const cChannel *Channel, int Priority, const int *Pids): - cReceiver(ChannelID, Priority, 0, Pids), +#if APIVERSNUM >= 10712 + cReceiver(Channel, Priority), +#else + cReceiver(Channel->GetChannelID(), Priority, 0, Pids), +#endif m_Streamer(Streamer) { +#if APIVERSNUM >= 10712 + // clears all PIDs but channel remains set + SetPids(NULL); + AddPids(Pids); +#endif } cStreamdevLiveReceiver::~cStreamdevLiveReceiver() @@ -456,7 +465,7 @@ void cStreamdevLiveStreamer::StartReceiver(void) if (m_NumPids > 0) { Dprintf("Creating Receiver to respect changed pids\n"); cReceiver *current = m_Receiver; - m_Receiver = new cStreamdevLiveReceiver(this, m_Channel->GetChannelID(), m_Priority, m_Pids); + m_Receiver = new cStreamdevLiveReceiver(this, m_Channel, m_Priority, m_Pids); cThreadLock ThreadLock(m_Device); if (IsRunning()) Attach(); |