X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/cedb8844dbefb4723e47ba0610582100b5362409..371447724a1e150c37a777e58a4725a3d2561c01:/lib/service/iservice.h diff --git a/lib/service/iservice.h b/lib/service/iservice.h index 2b42510d..e74fa0a6 100644 --- a/lib/service/iservice.h +++ b/lib/service/iservice.h @@ -2,6 +2,7 @@ #define __lib_dvb_iservice_h #include +#include #include #include #include @@ -166,6 +167,8 @@ public: SWIG_ALLOW_OUTPUT_SIMPLE(eServiceReference); +extern PyObject *New_eServiceReference(const eServiceReference &ref); // defined in enigma_python.i + typedef long long pts_t; /* the reason we have the servicereference as additional argument is @@ -249,6 +252,13 @@ public: sDescription, sTimeCreate, // unix time or string + + sTitle, + sArtist, + sAlbum, + sComment, + sTracknumber, + sGenre, }; enum { resNA = -1, resIsString = -2 }; @@ -268,9 +278,12 @@ public: enum { bitErrorRate, signalPower, - signalQuality + signalQuality, + LockState, + SyncState }; virtual int getFrontendInfo(int w)=0; + virtual PyObject *getFrontendData(bool original=false)=0; }; TEMPLATE_TYPEDEF(ePtr, iFrontendStatusInformationPtr); @@ -307,6 +320,7 @@ public: /* if you want to do several seeks in a row, you can enable the trickmode. audio will be switched off, sync will be disabled etc. */ virtual RESULT setTrickmode(int trick=0)=0; + virtual RESULT isCurrentlySeekable()=0; }; TEMPLATE_TYPEDEF(ePtr, iSeekableServicePtr); @@ -373,6 +387,23 @@ public: TEMPLATE_TYPEDEF(ePtr, iTimeshiftServicePtr); + /* not related to eCueSheet */ +class iCueSheet: public iObject +{ +#ifdef SWIG + iCueSheet(); + ~iCueSheet(); +#endif +public: + /* returns a list of (pts, what)-tuples */ + virtual PyObject *getCutList() = 0; + virtual void setCutList(PyObject *list) = 0; + virtual void setCutListEnable(int enable) = 0; + enum { cutIn = 0, cutOut = 1, cutMark = 2 }; +}; + +TEMPLATE_TYPEDEF(ePtr, iCueSheetPtr); + class iPlayableService: public iObject { #ifdef SWIG @@ -383,6 +414,8 @@ class iPlayableService: public iObject public: enum { + /* these first two events are magical, and should only + be generated if you know what you're doing. */ evStart, evEnd, @@ -394,7 +427,11 @@ public: /* when seek() is implemented: */ evSeekableStatusChanged, /* for example when timeshifting */ - evEOF + evEOF, + evSOF, /* bounced against start of file (when seeking backwards) */ + + /* only when cueSheet is implemented */ + evCuesheetChanged, }; virtual RESULT connectEvent(const Slot2 &event, ePtr &connection)=0; virtual RESULT start()=0; @@ -406,6 +443,7 @@ public: virtual SWIG_VOID(RESULT) subServices(ePtr &SWIG_OUTPUT)=0; virtual SWIG_VOID(RESULT) frontendStatusInfo(ePtr &SWIG_OUTPUT)=0; virtual SWIG_VOID(RESULT) timeshift(ePtr &SWIG_OUTPUT)=0; + virtual SWIG_VOID(RESULT) cueSheet(ePtr &SWIG_OUTPUT)=0; }; TEMPLATE_TYPEDEF(ePtr, iPlayableServicePtr); @@ -417,7 +455,7 @@ class iRecordableService: public iObject ~iRecordableService(); #endif public: - virtual RESULT prepare(const char *filename)=0; + virtual RESULT prepare(const char *filename, time_t begTime=-1, time_t endTime=-1, int eit_event_id=-1)=0; virtual RESULT start()=0; virtual RESULT stop()=0; }; @@ -442,6 +480,8 @@ public: /* moves a service in a list, only if list suppports a specific sort method. */ /* pos is the new, absolute position from 0..size-1 */ virtual RESULT moveService(eServiceReference &ref, int pos)=0; + /* set name of list, for bouquets this is the visible bouquet name */ + virtual RESULT setListName(const std::string &name)=0; }; TEMPLATE_TYPEDEF(ePtr, iMutableServiceListPtr); @@ -454,8 +494,9 @@ class iListableService: public iObject #endif public: /* legacy interface: get a list */ - virtual RESULT getContent(std::list &list)=0; - + virtual RESULT getContent(std::list &list, bool sorted=false)=0; + virtual RESULT getContent(PyObject *list, bool sorted=false)=0; + /* new, shiny interface: streaming. */ virtual SWIG_VOID(RESULT) getNext(eServiceReference &SWIG_OUTPUT)=0;