X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2c34a36b091994d17a50001faba2f1609c1a6231..ec7c78fd405d7d6579eb40ac52a56e904ee1e21f:/lib/service/iservice.h

diff --git a/lib/service/iservice.h b/lib/service/iservice.h
index fed66a29..eff03436 100644
--- 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.
 
@@ -205,6 +206,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
@@ -226,8 +229,6 @@ public:
 
 TEMPLATE_TYPEDEF(ePtr<iStaticServiceInformation>, iStaticServiceInformationPtr);
 
-TEMPLATE_TYPEDEF(ePtr<eServiceEvent>, eServiceEventPtr);
-
 class iServiceInformation: public iObject
 {
 #ifdef SWIG
@@ -345,12 +346,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 */
@@ -389,6 +384,33 @@ public:
 
 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
@@ -477,6 +499,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;
@@ -493,6 +517,8 @@ public:
 	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);
@@ -524,7 +550,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. */