X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d1e450f95a9b79b144a00dcf0f9356ff6cb9bfb2..7ad03cdd2e5a2493fdb3f346bc50358436c4e933:/lib/service/iservice.h

diff --git a/lib/service/iservice.h b/lib/service/iservice.h
index df4e302f..24d43fce 100644
--- a/lib/service/iservice.h
+++ b/lib/service/iservice.h
@@ -84,7 +84,7 @@ public:
 #ifndef SWIG
 	std::string name;
 #endif
-	std::string getName() { return name; }
+	std::string getName() const { return name; }
 	void setName( const std::string &n ) { name=n; }
 
 	eServiceReference()
@@ -301,7 +301,9 @@ public:
 		sVideoHeight,
 		sVideoWidth,
 
-		sTransponderData 	/* transponderdata as python dict */
+		sTransponderData, 	/* transponderdata as python dict */
+
+		sUser = 0x100
 	};
 	enum {
 		resNA = -1,
@@ -354,7 +356,8 @@ public:
 		signalQuality,
 		lockState,
 		syncState,
-		frontendNumber
+		frontendNumber,
+		signalQualitydB,
 	};
 };
 
@@ -417,6 +420,8 @@ public:
 		   audio will be switched off, sync will be disabled etc. */
 	virtual RESULT setTrickmode(int trick=0)=0;
 	virtual RESULT isCurrentlySeekable()=0;
+	virtual RESULT seekChapter(int) { return -1; }
+	virtual RESULT seekTitle(int) { return -1; }
 };
 SWIG_TEMPLATE_TYPEDEF(ePtr<iSeekableService>, iSeekableServicePtr);
 
@@ -425,9 +430,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);
 
@@ -442,6 +449,7 @@ public:
 	virtual int getNumberOfTracks()=0;
 	virtual RESULT selectTrack(unsigned int i)=0;
 	virtual SWIG_VOID(RESULT) getTrackInfo(struct iAudioTrackInfo &SWIG_OUTPUT, unsigned int n)=0;
+	virtual int getCurrentTrack()=0;
 };
 SWIG_TEMPLATE_TYPEDEF(ePtr<iAudioTrackSelection>, iAudioTrackSelectionPtr);
 
@@ -661,6 +669,54 @@ public:
 };
 SWIG_TEMPLATE_TYPEDEF(ePtr<iServiceOfflineOperations>, iServiceOfflineOperationsPtr);
 
+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 iServiceKeys_ENUMS
+{
+#ifdef SWIG
+	iServiceKeys_ENUMS();
+	~iServiceKeys_ENUMS();
+#endif
+public:
+	enum {
+		keyLeft,
+		keyRight,
+		keyUp,
+		keyDown,
+		keyOk,
+		keyUser = 0x100
+	};
+};
+
+SWIG_IGNORE(iServiceKeys);
+class iServiceKeys: public iServiceKeys_ENUMS, public iObject
+{
+#ifdef SWIG
+	iServiceKeys();
+	~iServiceKeys();
+#endif
+public:
+	virtual SWIG_VOID(RESULT) keyPressed(int key)=0;
+};
+SWIG_TEMPLATE_TYPEDEF(ePtr<iServiceKeys>, iServiceKeysPtr);
+
 class iPlayableService_ENUMS
 {
 #ifdef SWIG
@@ -699,7 +755,9 @@ public:
 
 		evVideoSizeChanged,
 
-		evStopped
+		evStopped,
+
+		evUser = 0x100
 	};
 };
 
@@ -731,28 +789,11 @@ public:
 	virtual SWIG_VOID(RESULT) subtitle(ePtr<iSubtitleOutput> &SWIG_OUTPUT)=0;
 	virtual SWIG_VOID(RESULT) audioDelay(ePtr<iAudioDelay> &SWIG_OUTPUT)=0;
 	virtual SWIG_VOID(RESULT) rdsDecoder(ePtr<iRdsDecoder> &SWIG_OUTPUT)=0;
+	virtual SWIG_VOID(RESULT) stream(ePtr<iStreamableService> &SWIG_OUTPUT)=0;
+	virtual SWIG_VOID(RESULT) keys(ePtr<iServiceKeys> &SWIG_OUTPUT)=0;
 };
 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
@@ -768,8 +809,8 @@ public:
 		evRecordRunning,
 		evRecordStopped,
 		evNewProgramInfo,
-		evRecordFailed
-		/*evDiskFull*/
+		evRecordFailed,
+		evRecordWriteError
 	};
 	enum {
 		NoError=0,
@@ -777,7 +818,9 @@ public:
 		errNoDemuxAvailable=-2,
 		errNoTsRecorderAvailable=-3,
 		errDiskFull=-4,
-		errTuneFailed=-255
+		errTuneFailed=-255,
+		errMisconfiguration = -256,
+		errNoResources = -257,
 	};
 };