Merge commit 'origin/bug_449_fix_wlan_usbstick_recognition'

[enigma2.git] / lib / dvb / radiotext.h

diff --git a/lib/dvb/radiotext.h b/lib/dvb/radiotext.h
index 8c354ff15435dcb5fe8b41e09b259f3cc62fced6..7a73eea3371afd3d08f3ac7af34a74bb9450373f 100644 (file)
--- a/lib/dvb/radiotext.h
+++ b/lib/dvb/radiotext.h
@@ -15,12 +15,14 @@ class eDVBRdsDecoder: public iObject, public ePESParser, public Object
        unsigned char qdar[60*1024]; //60 kB for holding Rass qdar archive
        unsigned short crc16, crc;
        long part, parts, partcnt;
-       enum { RadioTextChanged, RtpTextChanged, RassInteractivePicMaskChanged, RecvRassSlidePic };
        unsigned char rass_picture_mask[5];  // 40 bits... (10 * 4 pictures)
        void addToPictureMask(int id);
        void removeFromPictureMask(int id);
+       int m_type;
+       int m_pid;
 public:
-       eDVBRdsDecoder(iDVBDemux *demux);
+       enum { RadioTextChanged, RtpTextChanged, RassInteractivePicMaskChanged, RecvRassSlidePic };
+       eDVBRdsDecoder(iDVBDemux *demux, int type);
        ~eDVBRdsDecoder();
        int start(int pid);
        void connectEvent(const Slot1<void, int> &slot, ePtr<eConnection> &connection);
@@ -29,15 +31,16 @@ public:
        ePyObject getRassPictureMask();
        std::string getRassPicture(int page, int subpage);
        std::string getRassSlideshowPicture() { return "/tmp/RassLast.mvi"; }
+       int getPid() { return m_pid; }
 private:
        void abortNonAvail();
        void processPESPacket(__u8 *pkt, int len);
-       inline void gotAncillaryData(__u8 *data, int len);
+       void gotAncillaryData(const __u8 *data, int len);
        void process_qdar(unsigned char*);
        ePtr<iDVBPESReader> m_pes_reader;
        ePtr<eConnection> m_read_connection;
        Signal1<void, int> m_event;
-       eTimer m_abortTimer;
+       ePtr<eTimer> m_abortTimer;
 };
 
 #endif