summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVille Skyttä <ville.skytta@iki.fi>2012-03-11 19:32:14 +0200
committerVille Skyttä <ville.skytta@iki.fi>2012-03-11 19:32:14 +0200
commitffcb38b9f770dd214ed5e5b45f6f5825a55b906c (patch)
treeb706aea606ae172f39b98a9f5c692d609bd8f114
parentc547fd3af40bb83a3035c648e75e67e5a711e6ca (diff)
downloadvdr-plugin-ttxtsubs-ffcb38b9f770dd214ed5e5b45f6f5825a55b906c.tar.gz
vdr-plugin-ttxtsubs-ffcb38b9f770dd214ed5e5b45f6f5825a55b906c.tar.bz2
Adapt to VDR 1.7.26 API changes.
-rw-r--r--ttxtsubs.c17
1 files changed, 14 insertions, 3 deletions
diff --git a/ttxtsubs.c b/ttxtsubs.c
index 9781a26..e03ad16 100644
--- a/ttxtsubs.c
+++ b/ttxtsubs.c
@@ -136,7 +136,11 @@ public:
// -- cStatus
protected:
- virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber);
+ virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber
+#if APIVERSNUM >= 10726
+ , bool LiveView
+#endif
+ );
virtual void Replaying(const cControl *Control, const char *Name, const char *FileName, bool On);
// virtual void OsdClear(void) { ShowTtxt(); }
// virtual void OsdTitle(const char *Title) { HideTtxt(); }
@@ -328,10 +332,17 @@ bool cPluginTtxtsubs::SetupParse(const char *Name, const char *Value)
return true;
}
-void cPluginTtxtsubs::ChannelSwitch(const cDevice *Device, int ChannelNumber)
+void cPluginTtxtsubs::ChannelSwitch(const cDevice *Device, int ChannelNumber
+#if APIVERSNUM >= 10726
+ , bool LiveView
+#endif
+ )
{
+#if APIVERSNUM < 10726
+ bool LiveView = Device->IsPrimaryDevice();
+#endif
//dprint("cPluginTtxtsubs::ChannelSwitch(devicenr: %d, channelnr: %d) - mDispl: %x\n", Device->DeviceNumber(), ChannelNumber, mDispl); // XXX
- if (Device->IsPrimaryDevice() && !Device->Replaying() && ChannelNumber)
+ if (LiveView && !Device->Replaying() && ChannelNumber)
{
StopTtxt();
DELETENULL(mLiveReceiver);