fix bluescreen in ci menu when no entries in a menulist an ok is pressed

[enigma2.git] / lib / service / iservice.h

diff --git a/lib/service/iservice.h b/lib/service/iservice.h
index fb56175d056bbcf31eb0ceb4c7b6996c5c941314..ca2348ca85700ee23408374f8f6f3363ab79b269 100644 (file)
--- a/lib/service/iservice.h
+++ b/lib/service/iservice.h
@@ -51,13 +51,26 @@ public:
        std::string getPath() { return path; }
        void setPath( const std::string &n ) { path=n; }
 
-       unsigned int getData(unsigned int num) const
+       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) )
+                       return data[num];
+               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) )
@@ -261,6 +274,7 @@ public:
                sTracknumber,
                sGenre,
                sCAIDs,
+               sVideoType  // MPEG2 MPEG4
        };
        enum { resNA = -1, resIsString = -2, resIsPyObject = -3 };
 
@@ -271,25 +285,26 @@ public:
 
 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
 {
@@ -360,6 +375,20 @@ 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 iSubserviceList: public iObject
 {
 #ifdef SWIG
@@ -445,8 +474,9 @@ 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;
 };
@@ -463,6 +493,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);
@@ -500,7 +531,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;