X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4e8cae716ad3fdf29a7b2a45e5eec0a530f93277..0c59a4279f93f08fe95fca5f2e55f3e025f0cceb:/lib/service/servicedvb.h diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h index 79e8d540..85e97ea1 100644 --- a/lib/service/servicedvb.h +++ b/lib/service/servicedvb.h @@ -6,12 +6,19 @@ #include #include +#include #include +#include #include +class eStaticServiceDVBInformation; +class eStaticServiceDVBBouquetInformation; + class eServiceFactoryDVB: public iServiceHandler { -DECLARE_REF(eServiceFactoryDVB); + DECLARE_REF(eServiceFactoryDVB); + ePtr m_StaticServiceDVBInfo; + ePtr m_StaticServiceDVBBouquetInfo; public: eServiceFactoryDVB(); virtual ~eServiceFactoryDVB(); @@ -31,17 +38,17 @@ class eBouquet; class eDVBServiceList: public iListableService, public iMutableServiceList { -DECLARE_REF(eDVBServiceList); + DECLARE_REF(eDVBServiceList); public: virtual ~eDVBServiceList(); PyObject *getContent(const char* formatstr, bool sorted=false); RESULT getContent(std::list &list, bool sorted=false); RESULT getNext(eServiceReference &ptr); - int compareLessEqual(const eServiceReference &a, const eServiceReference &b); + inline int compareLessEqual(const eServiceReference &a, const eServiceReference &b); RESULT startEdit(ePtr &); RESULT flushChanges(); - RESULT addService(eServiceReference &ref); + RESULT addService(eServiceReference &ref, eServiceReference before); RESULT removeService(eServiceReference &ref); RESULT moveService(eServiceReference &ref, int pos); RESULT setListName(const std::string &name); @@ -56,14 +63,35 @@ private: eBouquet *m_bouquet; }; -class eDVBServicePlay: public iPlayableService, public iPauseableService, +inline int eDVBServiceList::compareLessEqual(const eServiceReference &a, const eServiceReference &b) +{ + return m_query->compareLessEqual((const eServiceReferenceDVB&)a, (const eServiceReferenceDVB&)b); +} + +class eDVBServiceBase: public iFrontendInformation +{ +protected: + eDVBServicePMTHandler m_service_handler; +public: + // iFrontendInformation + int getFrontendInfo(int w); + PyObject *getFrontendData(); + PyObject *getFrontendStatus(); + PyObject *getTransponderData(bool); + PyObject *getAll(bool original); // a sum of getFrontendData/Status/TransponderData +}; + +class eSubtitleWidget; + +class eDVBServicePlay: public eDVBServiceBase, + public iPlayableService, public iPauseableService, public iSeekableService, public Object, public iServiceInformation, public iAudioTrackSelection, public iAudioChannelSelection, - public iFrontendStatusInformation, public iSubserviceList, public iTimeshiftService, - public iCueSheet + public iCueSheet, public iSubtitleOutput, public iAudioDelay, + public iRdsDecoder, public iStreamableService { -DECLARE_REF(eDVBServicePlay); + DECLARE_REF(eDVBServicePlay); public: virtual ~eDVBServicePlay(); @@ -78,10 +106,14 @@ public: RESULT info(ePtr &ptr); RESULT audioChannel(ePtr &ptr); RESULT audioTracks(ePtr &ptr); - RESULT frontendStatusInfo(ePtr &ptr); + RESULT frontendInfo(ePtr &ptr); RESULT subServices(ePtr &ptr); RESULT timeshift(ePtr &ptr); RESULT cueSheet(ePtr &ptr); + RESULT subtitle(ePtr &ptr); + RESULT audioDelay(ePtr &ptr); + RESULT rdsDecoder(ePtr &ptr); + RESULT keys(ePtr &ptr) { ptr = 0; return -1; } // iPauseableService RESULT pause(); @@ -108,14 +140,17 @@ public: int getNumberOfTracks(); RESULT selectTrack(unsigned int i); RESULT getTrackInfo(struct iAudioTrackInfo &, unsigned int n); + int getCurrentTrack(); // iAudioChannelSelection int getCurrentChannel(); RESULT selectChannel(int i); - // iFrontendStatusInformation - int getFrontendInfo(int w); - PyObject *getFrontendData(bool); + // iRdsDecoder + std::string getText(int i=0); + void showRassSlidePicture(); + void showRassInteractivePic(int page, int subpage); + ePyObject getRassInteractiveMask(); // iSubserviceList int getNumberOfSubservices(); @@ -129,9 +164,24 @@ public: // iCueSheet PyObject *getCutList(); - void setCutList(PyObject *); + void setCutList(SWIG_PYOBJECT(ePyObject)); void setCutListEnable(int enable); + // iSubtitleOutput + RESULT enableSubtitles(eWidget *parent, SWIG_PYOBJECT(ePyObject) entry); + RESULT disableSubtitles(eWidget *parent); + PyObject *getSubtitleList(); + PyObject *getCachedSubtitle(); + + // iAudioDelay + int getAC3Delay(); + int getPCMDelay(); + void setAC3Delay(int); + void setPCMDelay(int); + + // iStreamableService + RESULT stream(ePtr &ptr); + PyObject *getStreamingData(); private: friend class eServiceFactoryDVB; eServiceReference m_reference; @@ -140,10 +190,13 @@ private: ePtr m_decoder; int m_is_primary; + int m_have_video_pid; + int m_tune_state; /* in timeshift mode, we essentially have two channels, and thus pmt handlers. */ - eDVBServicePMTHandler m_service_handler, m_service_handler_timeshift; + eDVBServicePMTHandler m_service_handler_timeshift; eDVBServiceEITHandler m_event_handler; + int m_current_audio_pid; eDVBServicePlay(const eServiceReference &ref, eDVBService *service); @@ -162,9 +215,9 @@ private: int m_timeshift_fd; ePtr m_decode_demux; - + int m_current_audio_stream; - int selectAudioStream(int n); + int selectAudioStream(int n = -1); /* timeshift */ ePtr m_record; @@ -205,8 +258,43 @@ private: void cutlistToCuesheet(); + eSubtitleWidget *m_subtitle_widget; + /* teletext subtitles */ ePtr m_teletext_parser; + void newSubtitlePage(const eDVBTeletextSubtitlePage &p); + ePtr m_new_subtitle_page_connection; + std::list m_subtitle_pages; + + /* dvb subtitles */ + ePtr m_subtitle_parser; + void newDVBSubtitlePage(const eDVBSubtitlePage &p); + ePtr m_new_dvb_subtitle_page_connection; + std::list m_dvb_subtitle_pages; + + ePtr m_subtitle_sync_timer; + void checkSubtitleTiming(); + + /* radiotext */ + ePtr m_rds_decoder; + ePtr m_rds_decoder_event_connection; + void rdsDecoderEvent(int); + + ePtr m_video_event_connection; + void video_event(struct iTSMPEGDecoder::videoEvent); + struct iTSMPEGDecoder::videoEvent m_videoEventData; +}; + +class eStaticServiceDVBBouquetInformation: public iStaticServiceInformation +{ + DECLARE_REF(eStaticServiceDVBBouquetInformation); + eServiceReference m_playable_service; +public: + eServiceReference &getPlayableService() { return m_playable_service; } + RESULT getName(const eServiceReference &ref, std::string &name); + int getLength(const eServiceReference &ref); + int isPlayable(const eServiceReference &ref, const eServiceReference &ignore); + RESULT getEvent(const eServiceReference &ref, ePtr &ptr, time_t start_time); }; #endif