diff options
| author | T. Lohmar <smarttv640@gmail.com> | 2015-12-27 10:04:14 +0100 |
|---|---|---|
| committer | T. Lohmar <smarttv640@gmail.com> | 2015-12-27 10:04:14 +0100 |
| commit | 89fa8d151e96f68a9190299a2f04c1e47590ea51 (patch) | |
| tree | b7b94bdbce3d4f6ce7c433835e1560a1c5b81abb /responselive.c | |
| parent | d1742e6314806e27f31282c596423a00b1ce25c8 (diff) | |
| parent | 9c5761be33f72ce2143906e4143620cba6b26973 (diff) | |
| download | vdr-plugin-smarttvweb-89fa8d151e96f68a9190299a2f04c1e47590ea51.tar.gz vdr-plugin-smarttvweb-89fa8d151e96f68a9190299a2f04c1e47590ea51.tar.bz2 | |
Merge branch 'master' of projects.vdr-developer.org:vdr-plugin-smarttvweb
Diffstat (limited to 'responselive.c')
| -rwxr-xr-x | responselive.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/responselive.c b/responselive.c index 114ff4c..a15f4c8 100755 --- a/responselive.c +++ b/responselive.c @@ -36,8 +36,13 @@ #define DEBUG +#if APIVERSNUM > 20300 +cLiveRelay::cLiveRelay(const cChannel* channel, cDevice* device, string chan_id, int req_id, cHttpResource* req) : cReceiver(channel, 0), + mChannelId(chan_id), mRingBuffer(), mReqId(req_id), mRequest(req), mNotifFd(0), mNotifRequired(true) +#else cLiveRelay::cLiveRelay(cChannel* channel, cDevice* device, string chan_id, int req_id, cHttpResource* req) : cReceiver(channel, 0), mChannelId(chan_id), mRingBuffer(), mReqId(req_id), mRequest(req), mNotifFd(0), mNotifRequired(true) +#endif { mLog = Log::getInstance(); @@ -87,7 +92,11 @@ void cLiveRelay::detachLiveRelay() { Detach(); } +#if APIVERSNUM >= 20300 +void cLiveRelay::Receive(const uchar* data, int length) { +#else void cLiveRelay::Receive(uchar* data, int length) { +#endif if (length != 188) { *(Log::getInstance()->log()) << "ERROR: ******* ts packet unequal 188 Byte Length= " << length << endl; @@ -155,7 +164,12 @@ cResponseLive::~cResponseLive() { } bool cResponseLive::InitRelay(string channel_id) { +#if APIVERSNUM > 20300 + LOCK_CHANNELS_READ; + const cChannel * channel = Channels->GetByChannelID(tChannelID::FromString(channel_id.c_str())); +#else cChannel * channel = Channels.GetByChannelID(tChannelID::FromString(channel_id.c_str())); +#endif if (!channel ){ *(mLog->log()) << DEBUGPREFIX |