X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/b96f203b700c91e463eff20889d734119530bce0..2ab514e090cb4f0dc14faa061820d9d154b37647:/lib/service/servicedvb.h diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h index 42e38013..4a40df12 100644 --- a/lib/service/servicedvb.h +++ b/lib/service/servicedvb.h @@ -6,11 +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(); @@ -33,14 +41,14 @@ class eDVBServiceList: public iListableService, public iMutableServiceList DECLARE_REF(eDVBServiceList); public: virtual ~eDVBServiceList(); + PyObject *getContent(const char* formatstr, bool sorted=false); RESULT getContent(std::list &list, bool sorted=false); - RESULT getContent(PyObject *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); @@ -55,11 +63,33 @@ 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 iFrontendStatusInformation, + public iAudioTrackSelection, public iAudioChannelSelection, public iSubserviceList, public iTimeshiftService, - public iCueSheet + public iCueSheet, public iSubtitleOutput, public iAudioDelay, + public iRdsDecoder, public iStreamableService { DECLARE_REF(eDVBServicePlay); public: @@ -69,15 +99,20 @@ public: RESULT connectEvent(const Slot2 &event, ePtr &connection); RESULT start(); RESULT stop(); + RESULT setTarget(int target); + RESULT seek(ePtr &ptr); RESULT pause(ePtr &ptr); 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); // iPauseableService RESULT pause(); @@ -98,14 +133,22 @@ public: RESULT getEvent(ePtr &evt, int nownext); int getInfo(int w); std::string getInfoString(int w); + PyObject *getInfoObject(int w); // iAudioTrackSelection int getNumberOfTracks(); RESULT selectTrack(unsigned int i); RESULT getTrackInfo(struct iAudioTrackInfo &, unsigned int n); - // iFrontendStatusInformation - int getFrontendInfo(int w); + // iAudioChannelSelection + int getCurrentChannel(); + RESULT selectChannel(int i); + + // iRdsDecoder + std::string getText(int i=0); + void showRassSlidePicture(); + void showRassInteractivePic(int page, int subpage); + ePyObject getRassInteractiveMask(); // iSubserviceList int getNumberOfSubservices(); @@ -119,8 +162,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; @@ -128,19 +187,24 @@ private: ePtr m_dvb_service; 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; eDVBServicePlay(const eServiceReference &ref, eDVBService *service); + /* events */ void gotNewEvent(); void serviceEvent(int event); void serviceEventTimeshift(int event); Signal2 m_event; + /* pvr */ int m_is_pvr, m_is_paused, m_timeshift_enabled, m_timeshift_active; int m_first_program_info; @@ -148,10 +212,11 @@ private: int m_timeshift_fd; ePtr m_decode_demux; - + int m_current_audio_stream; int selectAudioStream(int n); + /* timeshift */ ePtr m_record; std::set m_pids_active; @@ -163,6 +228,8 @@ private: int m_skipmode; + /* cuesheet */ + ePtr m_cue; struct cueEntry @@ -172,7 +239,7 @@ private: bool operator < (const struct cueEntry &o) const { - return what < o.what; + return where < o.where; } cueEntry(const pts_t &where, unsigned int what) : where(where), what(what) @@ -181,10 +248,50 @@ private: }; std::multiset m_cue_entries; - int m_cuesheet_changed; + int m_cuesheet_changed, m_cutlist_enabled; void loadCuesheet(); void saveCuesheet(); + + 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; + + eTimer 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