Merge remote branch 'remotes/origin/bug_319_dvdburnsettings_languagechoices' into...

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

diff --git a/lib/dvb/radiotext.h b/lib/dvb/radiotext.h
index ba42ded161193d0875176c0af4e74a4281b1a433..7a73eea3371afd3d08f3ac7af34a74bb9450373f 100644 (file)
--- a/lib/dvb/radiotext.h
+++ b/lib/dvb/radiotext.h
@@ -6,23 +6,41 @@
 #include <lib/dvb/pesparse.h>
 #include <lib/gdi/gpixmap.h>
 
-class eDVBRadioTextParser: public iObject, public ePESParser, public Object
+class eDVBRdsDecoder: public iObject, public ePESParser, public Object
 {
-       DECLARE_REF(eDVBRadioTextParser);
-       int bytesread, ptr, p1, p2, msgPtr;
-       unsigned char buf[128], message[66], leninfo, todo, state;
+       DECLARE_REF(eDVBRdsDecoder);
+       int msgPtr, bsflag, qdar_pos, t_ptr, qdarmvi_show;
+       unsigned char message[66], lastmessage[66], datamessage[256], rtp_buf[5], leninfo, text_len, text_len2, state;
+       unsigned char rtp_item[64][64], rtplus_osd[64]; //rtp
+       unsigned char qdar[60*1024]; //60 kB for holding Rass qdar archive
        unsigned short crc16, crc;
+       long part, parts, partcnt;
+       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:
-       eDVBRadioTextParser(iDVBDemux *demux);
+       enum { RadioTextChanged, RtpTextChanged, RassInteractivePicMaskChanged, RecvRassSlidePic };
+       eDVBRdsDecoder(iDVBDemux *demux, int type);
+       ~eDVBRdsDecoder();
        int start(int pid);
-       void connectUpdatedRadiotext(const Slot0<void> &slot, ePtr<eConnection> &connection);
-       const char *getCurrentText() { return msgPtr ? (const char*)message : ""; }
+       void connectEvent(const Slot1<void, int> &slot, ePtr<eConnection> &connection);
+       const char *getRadioText() { return (const char*)message; }
+       const char *getRtpText() { return (const char*)rtplus_osd; }
+       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);
-       void gotAncillaryByte(__u8 data);
+       void gotAncillaryData(const __u8 *data, int len);
+       void process_qdar(unsigned char*);
        ePtr<iDVBPESReader> m_pes_reader;
        ePtr<eConnection> m_read_connection;
-       Signal0<void> m_updated_radiotext;
+       Signal1<void, int> m_event;
+       ePtr<eTimer> m_abortTimer;
 };
 
 #endif