fix and simplify PluginList

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

diff --git a/lib/service/iservice.h b/lib/service/iservice.h
index d65012508f5bb6c6ac5e7f719ba30e1407655119..bfdca1ba46c6337a3354ce05aeba28f94e51779b 100644 (file)
--- a/lib/service/iservice.h
+++ b/lib/service/iservice.h
@@ -426,9 +426,11 @@ struct iAudioTrackInfo
 #ifndef SWIG
        std::string m_description;
        std::string m_language; /* iso639 */
+       int m_pid; /* for association with the stream. */
 #endif
        std::string getDescription() { return m_description; }
        std::string getLanguage() { return m_language; }
+       int getPID() { return m_pid; }
 };
 SWIG_ALLOW_OUTPUT_SIMPLE(iAudioTrackInfo);
 
@@ -705,7 +707,24 @@ public:
        };
 };
 
-class iStreamableService;
+SWIG_IGNORE(iStreamableService);
+class iStreamableService: public iObject
+{
+#ifdef SWIG
+       iStreamableService();
+       ~iStreamableService();
+#endif
+public:
+               /* returns a dict:
+                       { "demux": <n>,
+                         "pids": [(x,type),(y,type),(z,type),..],
+                         ...
+                       }
+                       with type being "video", "audio", "pmt", "pat"...
+               */
+       virtual PyObject *getStreamingData()=0;
+};
+SWIG_TEMPLATE_TYPEDEF(ePtr<iStreamableService>, iStreamableServicePtr);
 
 SWIG_IGNORE(iPlayableService);
 class iPlayableService: public iPlayableService_ENUMS, public iObject
@@ -739,25 +758,6 @@ public:
 };
 SWIG_TEMPLATE_TYPEDEF(ePtr<iPlayableService>, iPlayableServicePtr);
 
-SWIG_IGNORE(iStreamableService);
-class iStreamableService: public iObject
-{
-#ifdef SWIG
-       iStreamableService();
-       ~iStreamableService();
-#endif
-public:
-               /* returns a dict:
-                       { "demux": <n>,
-                         "pids": [(x,type),(y,type),(z,type),..],
-                         ...
-                       }
-                       with type being "video", "audio", "pmt", "pat"...
-               */
-       virtual PyObject *getStreamingData()=0;
-};
-SWIG_TEMPLATE_TYPEDEF(ePtr<iStreamableService>, iStreamableServicePtr);
-
 class iRecordableService_ENUMS
 {
 #ifdef SWIG