X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/40d02f130ec7ce66be08013e33b2006fa1453299..b32851030de5d3706883afa87598cba8a8226f5d:/lib/service/iservice.h

diff --git a/lib/service/iservice.h b/lib/service/iservice.h
index 5ddf0cf8..2c395a9c 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
@@ -274,6 +275,7 @@ public:
 		sTracknumber,
 		sGenre,
 		sCAIDs,
+		sVideoType  // MPEG2 MPEG4
 	};
 	enum { resNA = -1, resIsString = -2, resIsPyObject = -3 };
 
@@ -284,25 +286,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
 {
@@ -373,6 +376,35 @@ 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 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 iSubserviceList: public iObject
 {
 #ifdef SWIG
@@ -420,6 +452,19 @@ public:
 
 TEMPLATE_TYPEDEF(ePtr<iCueSheet>, iCueSheetPtr);
 
+class eWidget;
+class PyList;
+
+class iSubtitleOutput: public iObject
+{
+public:
+	virtual RESULT enableSubtitles(eWidget *parent, PyObject *entry)=0;
+	virtual RESULT disableSubtitles(eWidget *parent)=0;
+	virtual PyObject *getSubtitleList()=0;
+};
+
+TEMPLATE_TYPEDEF(ePtr<iSubtitleOutput>, iSubtitleOutputPtr);
+
 class iPlayableService: public iObject
 {
 #ifdef SWIG
@@ -458,10 +503,13 @@ 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;
+	virtual SWIG_VOID(RESULT) subtitle(ePtr<iSubtitleOutput> &SWIG_OUTPUT)=0;
+	virtual SWIG_VOID(RESULT) audioDelay(ePtr<iAudioDelay> &SWIG_OUTPUT)=0;
 };
 
 TEMPLATE_TYPEDEF(ePtr<iPlayableService>, iPlayableServicePtr);
@@ -476,6 +524,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);
@@ -492,7 +541,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. */