X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/70dfd18f5fc6f88b327ff5193b64ebff353c1458..14ae9c7897eaefad5caa0cecda762b0a8a9e9d72:/lib/service/iservice.h

diff --git a/lib/service/iservice.h b/lib/service/iservice.h
index abbeb1a2..b7b34fe2 100644
--- a/lib/service/iservice.h
+++ b/lib/service/iservice.h
@@ -44,6 +44,10 @@ public:
 	int data[8];
 	std::string path;
 
+// only for override service names in bouquets or to give servicerefs a name which not have a
+// real existing service ( for dvb eServiceDVB )
+	std::string name;
+
 	eServiceReference()
 		: type(idInvalid), flags(0)
 	{
@@ -105,7 +109,7 @@ public:
 	{
 		if (type != c.type)
 			return 0;
-		return /* (flags == c.flags) && */ (memcmp(data, c.data, sizeof(int)*8)==0) && (path == c.path);
+		return (memcmp(data, c.data, sizeof(int)*8)==0) && (path == c.path);
 	}
 	bool operator!=(const eServiceReference &c) const
 	{
@@ -118,11 +122,6 @@ public:
 
 		if (type > c.type)
 			return 0;
-			
-/*		if (flags < c.flags)
-			return 1;
-		if (flags > c.flags)
-			return 0; */
 
 		int r=memcmp(data, c.data, sizeof(int)*8);
 		if (r)
@@ -142,7 +141,7 @@ public:
 
 SWIG_ALLOW_OUTPUT_SIMPLE(eServiceReference);
 
-typedef unsigned long long pts_t;
+typedef long long pts_t;
 
 	/* the reason we have the servicereference as additional argument is
 	   that we don't have to create one object for every entry in a possibly
@@ -203,11 +202,31 @@ class iSeekableService: public iObject
 public:
 	virtual RESULT getLength(pts_t &SWIG_OUTPUT)=0;
 	virtual RESULT seekTo(pts_t to)=0;
+	enum { dirForward = +1, dirBackward = -1 };
+	virtual RESULT seekRelative(int direction, pts_t to)=0;
 	virtual RESULT getPlayPosition(pts_t &SWIG_OUTPUT)=0;
 };
 
 TEMPLATE_TYPEDEF(ePtr<iSeekableService>, iSeekableServicePtr);
 
+struct iAudioTrackInfo
+{
+	std::string m_description;
+	std::string getDescription() { return m_description; }
+};
+
+SWIG_ALLOW_OUTPUT_SIMPLE(iAudioTrackInfo);
+
+class iAudioTrackSelection: public iObject
+{
+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;
+};
+
+TEMPLATE_TYPEDEF(ePtr<iAudioTrackSelection>, iAudioTrackSelectionPtr);
+
 class iPlayableService: public iObject
 {
 	friend class iServiceHandler;
@@ -217,6 +236,7 @@ public:
 		evStart,
 		evEnd,
 		
+		evTuneFailed,
 		// when iServiceInformation is implemented:
 		evUpdatedEventInfo
 	};
@@ -226,6 +246,7 @@ public:
 	virtual SWIG_VOID(RESULT) seek(ePtr<iSeekableService> &SWIG_OUTPUT)=0;
 	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;
 };
 
 TEMPLATE_TYPEDEF(ePtr<iPlayableService>, iPlayableServicePtr);
@@ -242,6 +263,22 @@ TEMPLATE_TYPEDEF(ePtr<iRecordableService>, iRecordableServicePtr);
 
 // TEMPLATE_TYPEDEF(std::list<eServiceReference>, eServiceReferenceList);
 
+class iMutableServiceList: public iObject
+{
+public:
+		/* flush changes */
+	virtual RESULT flushChanges()=0;
+		/* adds a service to a list */
+	virtual RESULT addService(eServiceReference &ref)=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. */
+		/* pos is the new, absolute position from 0..size-1 */
+	virtual RESULT moveService(eServiceReference &ref, int pos)=0;
+};
+
+TEMPLATE_TYPEDEF(ePtr<iMutableServiceList>, iMutableServiceListPtr);
+
 class iListableService: public iObject
 {
 public:
@@ -257,6 +294,8 @@ public:
 		   (as well as a future "active" extension) won't be possible.
 		*/
 	virtual int compareLessEqual(const eServiceReference &, const eServiceReference &)=0;
+	
+	virtual SWIG_VOID(RESULT) startEdit(ePtr<iMutableServiceList> &SWIG_OUTPUT)=0;
 };
 
 TEMPLATE_TYPEDEF(ePtr<iListableService>, iListableServicePtr);
@@ -285,6 +324,8 @@ public:
 		// TODO: additional stuff, like a conversion interface?
 };
 
+TEMPLATE_TYPEDEF(ePtr<iServiceOfflineOperations>, iServiceOfflineOperationsPtr);
+
 class iServiceHandler: public iObject
 {
 public: