diff options
| -rw-r--r-- | txtrecv.c | 14 | ||||
| -rw-r--r-- | txtrecv.h | 6 |
2 files changed, 15 insertions, 5 deletions
@@ -483,9 +483,16 @@ cTxtStatus::~cTxtStatus() delete receiver; } -void cTxtStatus::ChannelSwitch(const cDevice *Device, int ChannelNumber) +void cTxtStatus::ChannelSwitch(const cDevice *Device, int ChannelNumber +#if APIVERSNUM >= 10726 + , bool LiveView +#endif + ) { -#if VDRVERSNUM >= 10725 +#if APIVERSNUM < 10726 + bool LiveView = Device->IsPrimaryDevice(); +#endif +#if APIVERSNUM >= 10725 // Disconnect receiver if channel is 0, will reconnect to new // receiver after channel change. if (ChannelNumber == 0 && Device->IsPrimaryDevice()) @@ -501,8 +508,7 @@ void cTxtStatus::ChannelSwitch(const cDevice *Device, int ChannelNumber) if (newLiveChannel == NULL) return; // ignore non-live-channel-switching - if (!Device->IsPrimaryDevice() || - ChannelNumber != cDevice::CurrentChannel()) return; + if (!LiveView || ChannelNumber != cDevice::CurrentChannel()) return; // live channel was changed // now re-attach the receiver to the new live channel @@ -176,7 +176,11 @@ private: bool storeTopText; Storage* storage; protected: - virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber); + virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber +#if APIVERSNUM >= 10726 + , bool LiveView +#endif + ); public: cTxtStatus(bool storeTopText, Storage* storage); ~cTxtStatus(); |
