diff --git a/HISTORY b/HISTORY index d3289ac..1c05de5 100644 --- a/HISTORY +++ b/HISTORY @@ -435,4 +435,4 @@ VDR Plugin 'femon' Revision History 2012-03-03: Version 1.7.14 -- Updated for vdr-1.7.25. +- Updated for vdr-1.7.26. diff --git a/femon.c b/femon.c index 0e8fdb9..b46e2ef 100644 --- a/femon.c +++ b/femon.c @@ -14,8 +14,8 @@ #include "femonservice.h" #include "femontools.h" -#if defined(APIVERSNUM) && APIVERSNUM < 10725 -#error "VDR-1.7.25 API version or greater is required!" +#if defined(APIVERSNUM) && APIVERSNUM < 10726 +#error "VDR-1.7.26 API version or greater is required!" #endif #ifndef GITVERSION diff --git a/femonosd.c b/femonosd.c index dfd2978..acf1006 100644 --- a/femonosd.c +++ b/femonosd.c @@ -725,13 +725,13 @@ void cFemonOsd::Show(void) } } -void cFemonOsd::ChannelSwitch(const cDevice * device, int channelNumber) +void cFemonOsd::ChannelSwitch(const cDevice * device, int channelNumber, bool liveView) { debug("%s(%d,%d)\n", __PRETTY_FUNCTION__, device->DeviceNumber(), channelNumber); eTrackType track = cDevice::PrimaryDevice()->GetCurrentAudioTrack(); cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel()); - if (!device->IsPrimaryDevice() || !channelNumber || !channel || channel->Number() != channelNumber) + if (!liveView || !device->IsPrimaryDevice() || !channelNumber || !channel || channel->Number() != channelNumber) return; m_DeviceSource = DEVICESOURCE_DVBAPI; @@ -816,13 +816,13 @@ bool cFemonOsd::DeviceSwitch(int direction) } if (cDevice::GetDevice(device)->ProvidesChannel(channel, 0)) { debug("%s(%d) device(%d)\n", __PRETTY_FUNCTION__, direction, device); - cStatus::MsgChannelSwitch(cDevice::PrimaryDevice(), 0); + cStatus::MsgChannelSwitch(cDevice::PrimaryDevice(), 0, true); cControl::Shutdown(); cDevice::GetDevice(device)->SwitchChannel(channel, true); if (cDevice::GetDevice(device) == cDevice::PrimaryDevice()) cDevice::GetDevice(device)->ForceTransferMode(); cControl::Launch(new cTransferControl(cDevice::GetDevice(device), channel)); - cStatus::MsgChannelSwitch(cDevice::PrimaryDevice(), channel->Number()); + cStatus::MsgChannelSwitch(cDevice::PrimaryDevice(), channel->Number(), true); return (true); } } diff --git a/femonosd.h b/femonosd.h index dc598cb..7398452 100644 --- a/femonosd.h +++ b/femonosd.h @@ -79,7 +79,7 @@ protected: cFemonOsd(const cFemonOsd&); cFemonOsd& operator= (const cFemonOsd&); virtual void Action(void); - virtual void ChannelSwitch(const cDevice * device, int channelNumber); + virtual void ChannelSwitch(const cDevice *device, int channelNumber, bool liveView); virtual void SetAudioTrack(int Index, const char * const *Tracks); public: