21694da2c5
- Update multimedia/vdr-plugin-epgsearch to 1.0.1s20120322 git snapshot. - Update multimedia/vdr-plugin-femon to 1.7.15 . - Update multimedia/vdr-plugin-iptv to 0.5.0 . - Update multimedia/vdr-plugin-osdteletext to 0.9.2 . - Update multimedia/vdr-plugin-streamdev to 0.5.1p20120311 git snapthot. - Update multimedia/vdr-plugin-xineliboutput to 1.0.90s20111129.1002 cvs snapshot. - Bump PORTREVISION for all other plugins and add vdr 1.7.27 compatibility/bugfix patches where necessary.
47 lines
1.6 KiB
Text
47 lines
1.6 KiB
Text
diff --git a/txtrecv.c b/txtrecv.c
|
|
index 3dc89f6..3de5c1d 100644
|
|
--- a/txtrecv.c
|
|
+++ b/txtrecv.c
|
|
@@ -518,7 +518,7 @@ void cTxtStatus::ChannelSwitch(const cDevice *Device, int ChannelNumber
|
|
int TPid = newLiveChannel->Tpid();
|
|
|
|
if (TPid) {
|
|
- receiver = new cTxtReceiver(TPid, newLiveChannel->GetChannelID(), storeTopText, storage);
|
|
+ receiver = new cTxtReceiver(newLiveChannel, storeTopText, storage);
|
|
cDevice::ActualDevice()->AttachReceiver(receiver);
|
|
}
|
|
|
|
@@ -526,10 +526,18 @@ void cTxtStatus::ChannelSwitch(const cDevice *Device, int ChannelNumber
|
|
}
|
|
|
|
|
|
-cTxtReceiver::cTxtReceiver(int TPid, tChannelID chan, bool storeTopText, Storage* storage)
|
|
- : cReceiver(chan, -1, TPid), cThread("osdteletext-receiver"),
|
|
+cTxtReceiver::cTxtReceiver(const cChannel* chan, bool storeTopText, Storage* storage)
|
|
+#if APIVERSNUM >= 10712
|
|
+ : cReceiver(chan, -1), cThread("osdteletext-receiver"),
|
|
+#else
|
|
+ : cReceiver(chan, -1, chan->Tpid()), cThread("osdteletext-receiver"),
|
|
+#endif
|
|
TxtPage(0), storeTopText(storeTopText), buffer((188+60)*75), storage(storage)
|
|
{
|
|
+#if APIVERSNUM >= 10712
|
|
+ SetPids(NULL);
|
|
+ AddPid(chan->Tpid());
|
|
+#endif
|
|
storage->prepareDirectory(ChannelID());
|
|
|
|
// 10 ms timeout on getting TS frames
|
|
diff --git a/txtrecv.h b/txtrecv.h
|
|
index a111d0d..3468b6e 100644
|
|
--- a/txtrecv.h
|
|
+++ b/txtrecv.h
|
|
@@ -165,7 +165,7 @@ protected:
|
|
virtual void Receive(uchar *Data, int Length);
|
|
virtual void Action();
|
|
public:
|
|
- cTxtReceiver(int TPid, tChannelID chan, bool storeTopText, Storage* storage);
|
|
+ cTxtReceiver(const cChannel* chan, bool storeTopText, Storage* storage);
|
|
virtual ~cTxtReceiver();
|
|
virtual void Stop();
|
|
};
|