From ee0b7d685e1eccb22cc4d5ed0d7bd9bded052949 Mon Sep 17 00:00:00 2001 From: etobi Date: Sun, 25 Oct 2009 19:22:40 +0100 Subject: Removed unneccesary chan member from cTxtReceiver (References #177) Patch provided by Andreas Brachold --- txtrecv.c | 6 +++--- txtrecv.h | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/txtrecv.c b/txtrecv.c index 1d4c66a..5abb66a 100644 --- a/txtrecv.c +++ b/txtrecv.c @@ -541,9 +541,9 @@ void cTxtStatus::ChannelSwitch(const cDevice *Device, int ChannelNumber) cTxtReceiver::cTxtReceiver(int TPid, tChannelID chan) : cReceiver(chan, -1, TPid), cThread("osdteletext-receiver"), - chan(chan), TxtPage(0), buffer((188+60)*75), running(false) + TxtPage(0), buffer((188+60)*75), running(false) { - Storage::instance()->prepareDirectory(chan); + Storage::instance()->prepareDirectory(ChannelID()); // 10 ms timeout on getting TS frames buffer.SetTimeouts(0, 10); } @@ -700,7 +700,7 @@ void cTxtReceiver::DecodeTXT(uchar* TXT_buf) pgno = mag8 * 256 + b1; subno = (b2 + b3 * 256) & 0x3f7f; // Sub Page Number - TxtPage = new cTelePage(PageID(chan, pgno, subno), flags, lang, mag); + TxtPage = new cTelePage(PageID(ChannelID(), pgno, subno), flags, lang, mag); TxtPage->SetLine((int)line,(uchar *)ptr); break; } diff --git a/txtrecv.h b/txtrecv.h index 640bf6f..6c3dd42 100644 --- a/txtrecv.h +++ b/txtrecv.h @@ -162,7 +162,6 @@ class cTxtReceiver : public cReceiver, public cThread { private: void DecodeTXT(uchar*); uchar unham16 (uchar*); - tChannelID chan; cTelePage *TxtPage; protected: virtual void Activate(bool On); -- cgit v1.2.3