X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/0980594e3037839b361eae71646ccf960aaa2659..e50156a91ed81be0b9b00b7bdaab60ee17130bf5:/lib/service/iservice.h

diff --git a/lib/service/iservice.h b/lib/service/iservice.h
index 462f3dc5..7448a5e0 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,14 @@ public:
 		sVideoHeight,
 		sVideoWidth,
 
-		sTransponderData 	/* transponderdata as python dict */
+		sTransponderData, 	/* transponderdata as python dict */
+
+		sCurrentChapter,
+		sCurrentTitle,
+		sTotalChapters,
+		sTotalTitles,
+
+		sUser = 0x100
 	};
 	enum {
 		resNA = -1,
@@ -418,6 +425,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);
 
@@ -665,6 +674,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
@@ -678,6 +735,7 @@ public:
 		evStart,
 		evEnd,
 
+		evTunedIn,
 		evTuneFailed,
 
 			/* when iServiceInformation is implemented:*/
@@ -702,29 +760,14 @@ public:
 		evUpdatedRassInteractivePicMask,
 
 		evVideoSizeChanged,
+		evVideoFramerateChanged,
+		evVideoProgressiveChanged,
 
-		evStopped
-	};
-};
+		evStopped,
 
-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;
+		evUser = 0x100
+	};
 };
-SWIG_TEMPLATE_TYPEDEF(ePtr<iStreamableService>, iStreamableServicePtr);
 
 SWIG_IGNORE(iPlayableService);
 class iPlayableService: public iPlayableService_ENUMS, public iObject
@@ -755,6 +798,7 @@ public:
 	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);