git.cweiske.de / enigma2.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
add function to get a comparable service reference string (useable to
[enigma2.git] / lib / service / iservice.h
diff --git a/lib/service/iservice.h b/lib/service/iservice.h
index 7ea8c17bd06d429c6eeee6262adc9c8812188664..31c1c99d7d025bfd9ef7f2c20db94f2a219d1785 100644 (file)
--- a/lib/service/iservice.h
+++ b/lib/service/iservice.h
@@ -38,7 +38,8 @@ public:
                flagDirectory=isDirectory|mustDescent|canDescent,
                shouldSort=8,                   // should be ASCII-sorted according to service_name. great for directories.
                hasSortKey=16,          // has a sort key in data[3]. not having a sort key implies 0.
-               sort1=32                                        // sort key is 1 instead of 0
+               sort1=32,                                       // sort key is 1 instead of 0
+               isMarker=64                     // Marker
        };
        int flags; // flags will NOT be compared.
 
@@ -51,6 +52,13 @@ public:
        std::string getPath() { return path; }
        void setPath( const std::string &n ) { path=n; }
 
+       unsigned int getUnsignedData(unsigned int num) const
+       {
+               if ( num < sizeof(data)/sizeof(int) )
+                       return data[num];
+               return 0;
+       }
+
        int getData(unsigned int num) const
        {
                if ( num < sizeof(data)/sizeof(int) )
@@ -58,6 +66,12 @@ public:
                return 0;
        }
 
+       void setUnsignedData(unsigned int num, unsigned int val)
+       {
+               if ( num < sizeof(data)/sizeof(int) )
+                       data[num] = val;
+       }
+
        void setData(unsigned int num, int val)
        {
                if ( num < sizeof(data)/sizeof(int) )
@@ -131,6 +145,7 @@ public:
 #endif
        eServiceReference(const std::string &string);
        std::string toString() const;
+       std::string toCompareString() const;
        bool operator==(const eServiceReference &c) const
        {
                if (type != c.type)
@@ -192,6 +207,8 @@ typedef long long pts_t;
           
           Hide the result only if there is another way to check for failure! */
           
+TEMPLATE_TYPEDEF(ePtr<eServiceEvent>, eServiceEventPtr);
+       
 class iStaticServiceInformation: public iObject
 {
 #ifdef SWIG
@@ -213,8 +230,6 @@ public:
 
 TEMPLATE_TYPEDEF(ePtr<iStaticServiceInformation>, iStaticServiceInformationPtr);
 
-TEMPLATE_TYPEDEF(ePtr<eServiceEvent>, eServiceEventPtr);
-
 class iServiceInformation: public iObject
 {
 #ifdef SWIG
@@ -225,7 +240,7 @@ public:
        virtual SWIG_VOID(RESULT) getName(std::string &SWIG_OUTPUT)=0;
        virtual SWIG_VOID(RESULT) getEvent(ePtr<eServiceEvent> &SWIG_OUTPUT, int nownext);
 
-       enum { 
+       enum {
                sIsCrypted,  /* is encrypted (no indication if decrypt was possible) */
                sAspect,     /* aspect ratio: 0=4:3, 1=16:9, 2=whatever we need */
                sIsMultichannel, /* multichannel *available* (probably not selected) */
@@ -260,34 +275,38 @@ public:
                sComment,
                sTracknumber,
                sGenre,
+               sCAIDs,
+               sVideoType  // MPEG2 MPEG4
        };
-       enum { resNA = -1, resIsString = -2 };
+       enum { resNA = -1, resIsString = -2, resIsPyObject = -3 };
 
        virtual int getInfo(int w);
        virtual std::string getInfoString(int w);
+       virtual PyObject *getInfoObject(int w);
 };
 
 TEMPLATE_TYPEDEF(ePtr<iServiceInformation>, iServiceInformationPtr);
 
-class iFrontendStatusInformation: public iObject
+class iFrontendInformation: public iObject
 {
 #ifdef SWIG
-       iFrontendStatusInformation();
-       ~iFrontendStatusInformation();
+       iFrontendInformation();
+       ~iFrontendInformation();
 #endif
 public:
        enum {
                bitErrorRate,
                signalPower,
                signalQuality,
-               LockState,
-               SyncState
+               lockState,
+               syncState,
+               frontendNumber
        };
        virtual int getFrontendInfo(int w)=0;
        virtual PyObject *getFrontendData(bool original=false)=0;
 };
 
-TEMPLATE_TYPEDEF(ePtr<iFrontendStatusInformation>, iFrontendStatusInformationPtr);
+TEMPLATE_TYPEDEF(ePtr<iFrontendInformation>, iFrontendInformationPtr);
 
 class iPauseableService: public iObject
 {
@@ -328,12 +347,6 @@ TEMPLATE_TYPEDEF(ePtr<iSeekableService>, iSeekableServicePtr);
 
 struct iAudioTrackInfo
 {
-#ifdef SWIG
-private:
-       iAudioTrackInfo();
-       ~iAudioTrackInfo();
-public:
-#endif
 #ifndef SWIG
        std::string m_description;
        std::string m_language; /* iso639 */
@@ -358,6 +371,47 @@ public:
 
 TEMPLATE_TYPEDEF(ePtr<iAudioTrackSelection>, iAudioTrackSelectionPtr);
 
+class iAudioChannelSelection: public iObject
+{
+#ifdef SWIG
+       iAudioChannelSelection();
+       ~iAudioChannelSelection();
+#endif
+public:
+       enum { LEFT, STEREO, RIGHT };
+       virtual int getCurrentChannel()=0;
+       virtual RESULT selectChannel(int i)=0;
+};
+
+TEMPLATE_TYPEDEF(ePtr<iAudioChannelSelection>, iAudioChannelSelectionPtr);
+
+class iAudioDelay: public iObject
+{
+#ifdef SWIG
+       iAudioDelay();
+       ~iAudioDelay();
+#endif
+public:
+       virtual int getAC3Delay()=0;
+       virtual int getPCMDelay()=0;
+       virtual void setAC3Delay(int)=0;
+       virtual void setPCMDelay(int)=0;
+};
+
+TEMPLATE_TYPEDEF(ePtr<iAudioDelay>, iAudioDelayPtr);
+
+class iRadioText: public iObject
+{
+#ifdef SWIG
+       iRadioText();
+       ~iRadioText();
+#endif
+public:
+       virtual std::string getRadioText(int x=0)=0;
+};
+
+TEMPLATE_TYPEDEF(ePtr<iRadioText>, iRadioTextPtr);
+
 class iSubserviceList: public iObject
 {
 #ifdef SWIG
@@ -405,6 +459,19 @@ public:
 
 TEMPLATE_TYPEDEF(ePtr<iCueSheet>, iCueSheetPtr);
 
+class eWidget;
+class PyList;
+
+class iSubtitleOutput: public iObject
+{
+public:
+       virtual RESULT enableSubtitles(eWidget *parent, PyObject *entry)=0;
+       virtual RESULT disableSubtitles(eWidget *parent)=0;
+       virtual PyObject *getSubtitleList()=0;
+};
+
+TEMPLATE_TYPEDEF(ePtr<iSubtitleOutput>, iSubtitleOutputPtr);
+
 class iPlayableService: public iObject
 {
 #ifdef SWIG
@@ -433,6 +500,8 @@ public:
                
                        /* only when cueSheet is implemented */
                evCuesheetChanged,
+
+               evUpdatedRadioText
        };
        virtual RESULT connectEvent(const Slot2<void,iPlayableService*,int> &event, ePtr<eConnection> &connection)=0;
        virtual RESULT start()=0;
@@ -443,10 +512,14 @@ public:
        virtual SWIG_VOID(RESULT) pause(ePtr<iPauseableService> &SWIG_OUTPUT)=0;
        virtual SWIG_VOID(RESULT) info(ePtr<iServiceInformation> &SWIG_OUTPUT)=0;
        virtual SWIG_VOID(RESULT) audioTracks(ePtr<iAudioTrackSelection> &SWIG_OUTPUT)=0;
+       virtual SWIG_VOID(RESULT) audioChannel(ePtr<iAudioChannelSelection> &SWIG_OUTPUT)=0;
        virtual SWIG_VOID(RESULT) subServices(ePtr<iSubserviceList> &SWIG_OUTPUT)=0;
-       virtual SWIG_VOID(RESULT) frontendStatusInfo(ePtr<iFrontendStatusInformation> &SWIG_OUTPUT)=0;
+       virtual SWIG_VOID(RESULT) frontendInfo(ePtr<iFrontendInformation> &SWIG_OUTPUT)=0;
        virtual SWIG_VOID(RESULT) timeshift(ePtr<iTimeshiftService> &SWIG_OUTPUT)=0;
        virtual SWIG_VOID(RESULT) cueSheet(ePtr<iCueSheet> &SWIG_OUTPUT)=0;
+       virtual SWIG_VOID(RESULT) subtitle(ePtr<iSubtitleOutput> &SWIG_OUTPUT)=0;
+       virtual SWIG_VOID(RESULT) audioDelay(ePtr<iAudioDelay> &SWIG_OUTPUT)=0;
+       virtual SWIG_VOID(RESULT) radioText(ePtr<iRadioText> &SWIG_OUTPUT)=0;
 };
 
 TEMPLATE_TYPEDEF(ePtr<iPlayableService>, iPlayableServicePtr);
@@ -461,6 +534,7 @@ public:
        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;
+       virtual SWIG_VOID(RESULT) frontendInfo(ePtr<iFrontendInformation> &SWIG_OUTPUT)=0;
 };
 
 TEMPLATE_TYPEDEF(ePtr<iRecordableService>, iRecordableServicePtr);
@@ -477,7 +551,7 @@ public:
                /* flush changes */
        virtual RESULT flushChanges()=0;
                /* adds a service to a list */
-       virtual RESULT addService(eServiceReference &ref)=0;
+       virtual RESULT addService(eServiceReference &ref, eServiceReference before=eServiceReference())=0;
                /* removes a service from a list */
        virtual RESULT removeService(eServiceReference &ref)=0;
                /* moves a service in a list, only if list suppports a specific sort method. */
@@ -498,7 +572,7 @@ class iListableService: public iObject
 public:
                /* legacy interface: get a list */
        virtual RESULT getContent(std::list<eServiceReference> &list, bool sorted=false)=0;
-       virtual RESULT getContent(PyObject *list, bool sorted=false)=0;
+       virtual PyObject *getContent(const char* format, bool sorted=false)=0;
 
                /* new, shiny interface: streaming. */
        virtual SWIG_VOID(RESULT) getNext(eServiceReference &SWIG_OUTPUT)=0;
Clone of git://git.opendreambox.org/git/enigma2.git before dream multimedia removed all the engima2 sources