diff options
| author | etobi <git@e-tobi.net> | 2012-05-16 21:47:29 +0200 |
|---|---|---|
| committer | etobi <git@e-tobi.net> | 2012-05-16 22:34:18 +0200 |
| commit | 97b9a19e1a9947eaff462815b907ea7050dfa9d7 (patch) | |
| tree | a545cf9ce61aee0ffdc28914349f14b942bc170d /osd.c | |
| parent | fb0a8d6c538547a0311dea8287a0acedce6d9d42 (diff) | |
| download | vdr-plugin-osdpip-97b9a19e1a9947eaff462815b907ea7050dfa9d7.tar.gz vdr-plugin-osdpip-97b9a19e1a9947eaff462815b907ea7050dfa9d7.tar.bz2 | |
Adapted for VDR 1.7.27 (Closes #981, #964, #902) and dropped VDR 1.6 support
Diffstat (limited to 'osd.c')
| -rw-r--r-- | osd.c | 17 |
1 files changed, 2 insertions, 15 deletions
@@ -29,14 +29,9 @@ #include "quantize.h" #include "receiver.h" #include "setup.h" -#if VDRVERSNUM > 10703 #include "remux.h" -#endif #include <vdr/ringbuffer.h> -#if VDRVERSNUM <= 10703 -#include <vdr/remux.h> -#endif #include <vdr/thread.h> #include <vdr/menu.h> @@ -99,11 +94,7 @@ void cOsdPipObject::SwapChannels(void) if (chan) { Stop(); Channels.SwitchTo(m_Channel->Number()); -#if (APIVERSNUM < 10500) - cDevice *dev = cDevice::GetDevice(chan, 1); -#else cDevice *dev = cDevice::GetDevice(chan, 1, false); -#endif if (dev) { DELETENULL(m_Receiver); m_Channel = chan; @@ -123,11 +114,7 @@ void cOsdPipObject::SwitchOsdPipChan(int i) { Stop(); DELETENULL(m_Receiver); -#if (APIVERSNUM < 10500) - cDevice *dev = cDevice::GetDevice(pipChan, 1); -#else cDevice *dev = cDevice::GetDevice(pipChan, 1, false); -#endif if (dev) { m_Channel = pipChan; @@ -890,9 +877,9 @@ eOSState cOsdPipObject::ProcessKey(eKeys Key) return state; } -void cOsdPipObject::ChannelSwitch(const cDevice * device, int channelNumber) +void cOsdPipObject::ChannelSwitch(const cDevice * device, int channelNumber, bool LiveView) { - if (device != cDevice::PrimaryDevice()) + if (!LiveView) return; if (channelNumber == 0) return; |