X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fservice%2Fiservice.h;h=53abbf1a7b08445e46c8021b260b85e3c7a69e91;hb=bcfb71b423699d8f7e1d1e7bb5dc24ad4413a4ae;hp=d234b6afbf487318719c79b62bdbfc8a2ef2ba15;hpb=85f2616ef78700cf2639992abaf1011ecaa897bd;p=vuplus_dvbapp

diff --git a/lib/service/iservice.h b/lib/service/iservice.h
index d234b6a..53abbf1 100644
--- a/lib/service/iservice.h
+++ b/lib/service/iservice.h
@@ -2,6 +2,7 @@
 #define __lib_dvb_iservice_h
 
 #include <lib/python/swig.h>
+#include <lib/python/python.h>
 #include <lib/base/object.h>
 #include <string>
 #include <connection.h>
@@ -166,6 +167,8 @@ public:
 
 SWIG_ALLOW_OUTPUT_SIMPLE(eServiceReference);
 
+extern PyObject *New_eServiceReference(const eServiceReference &ref); // defined in enigma_python.i
+
 typedef long long pts_t;
 
 	/* the reason we have the servicereference as additional argument is
@@ -222,7 +225,7 @@ public:
 	virtual SWIG_VOID(RESULT) getName(std::string &SWIG_OUTPUT)=0;
 	virtual SWIG_VOID(RESULT) getEvent(ePtr<eServiceEvent> &SWIG_OUTPUT, int nownext);
 
-	enum { 
+	enum {
 		sIsCrypted,  /* is encrypted (no indication if decrypt was possible) */
 		sAspect,     /* aspect ratio: 0=4:3, 1=16:9, 2=whatever we need */
 		sIsMultichannel, /* multichannel *available* (probably not selected) */
@@ -248,12 +251,22 @@ public:
 		sProvider,
 		
 		sDescription,
+		sServiceref,
 		sTimeCreate,	// unix time or string
+		
+		sTitle,
+		sArtist,
+		sAlbum,
+		sComment,
+		sTracknumber,
+		sGenre,
+		sCAIDs,
 	};
-	enum { resNA = -1, resIsString = -2 };
+	enum { resNA = -1, resIsString = -2, resIsPyObject = -3 };
 
 	virtual int getInfo(int w);
 	virtual std::string getInfoString(int w);
+	virtual PyObject *getInfoObject(int w);
 };
 
 TEMPLATE_TYPEDEF(ePtr<iServiceInformation>, iServiceInformationPtr);
@@ -268,9 +281,12 @@ public:
 	enum {
 		bitErrorRate,
 		signalPower,
-		signalQuality
+		signalQuality,
+		LockState,
+		SyncState
 	};
 	virtual int getFrontendInfo(int w)=0;
+	virtual PyObject *getFrontendData(bool original=false)=0;
 };
 
 TEMPLATE_TYPEDEF(ePtr<iFrontendStatusInformation>, iFrontendStatusInformationPtr);
@@ -307,6 +323,7 @@ public:
 		/* if you want to do several seeks in a row, you can enable the trickmode. 
 		   audio will be switched off, sync will be disabled etc. */
 	virtual RESULT setTrickmode(int trick=0)=0;
+	virtual RESULT isCurrentlySeekable()=0;
 };
 
 TEMPLATE_TYPEDEF(ePtr<iSeekableService>, iSeekableServicePtr);
@@ -365,10 +382,31 @@ class iTimeshiftService: public iObject
 public:
 	virtual RESULT startTimeshift()=0;
 	virtual RESULT stopTimeshift()=0;
+	
+	virtual int isTimeshiftActive()=0;
+			/* this essentially seeks to the relative end of the timeshift buffer */
+	virtual RESULT activateTimeshift()=0;
 };
 
 TEMPLATE_TYPEDEF(ePtr<iTimeshiftService>, iTimeshiftServicePtr);
 
+	/* not related to eCueSheet */
+class iCueSheet: public iObject
+{
+#ifdef SWIG
+	iCueSheet();
+	~iCueSheet();
+#endif
+public:
+			/* returns a list of (pts, what)-tuples */
+	virtual PyObject *getCutList() = 0;
+	virtual void setCutList(PyObject *list) = 0;
+	virtual void setCutListEnable(int enable) = 0;
+	enum { cutIn = 0, cutOut = 1, cutMark = 2 };
+};
+
+TEMPLATE_TYPEDEF(ePtr<iCueSheet>, iCueSheetPtr);
+
 class iPlayableService: public iObject
 {
 #ifdef SWIG
@@ -379,6 +417,8 @@ class iPlayableService: public iObject
 public:
 	enum
 	{
+			/* these first two events are magical, and should only
+			   be generated if you know what you're doing. */
 		evStart,
 		evEnd,
 		
@@ -386,10 +426,21 @@ public:
 			// when iServiceInformation is implemented:
 		evUpdatedEventInfo,
 		evUpdatedInfo,
+
+			/* when seek() is implemented: */		
+		evSeekableStatusChanged, /* for example when timeshifting */
+		
+		evEOF,
+		evSOF, /* bounced against start of file (when seeking backwards) */
+		
+			/* only when cueSheet is implemented */
+		evCuesheetChanged,
 	};
 	virtual RESULT connectEvent(const Slot2<void,iPlayableService*,int> &event, ePtr<eConnection> &connection)=0;
 	virtual RESULT start()=0;
 	virtual RESULT stop()=0;
+			/* might have to be changed... */
+	virtual RESULT setTarget(int target)=0;
 	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;
@@ -397,6 +448,7 @@ public:
 	virtual SWIG_VOID(RESULT) subServices(ePtr<iSubserviceList> &SWIG_OUTPUT)=0;
 	virtual SWIG_VOID(RESULT) frontendStatusInfo(ePtr<iFrontendStatusInformation> &SWIG_OUTPUT)=0;
 	virtual SWIG_VOID(RESULT) timeshift(ePtr<iTimeshiftService> &SWIG_OUTPUT)=0;
+	virtual SWIG_VOID(RESULT) cueSheet(ePtr<iCueSheet> &SWIG_OUTPUT)=0;
 };
 
 TEMPLATE_TYPEDEF(ePtr<iPlayableService>, iPlayableServicePtr);
@@ -408,7 +460,7 @@ class iRecordableService: public iObject
 	~iRecordableService();
 #endif
 public:
-	virtual RESULT prepare(const char *filename)=0;
+	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;
 };
@@ -433,6 +485,8 @@ public:
 		/* 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;
+		/* set name of list, for bouquets this is the visible bouquet name */
+	virtual RESULT setListName(const std::string &name)=0;
 };
 
 TEMPLATE_TYPEDEF(ePtr<iMutableServiceList>, iMutableServiceListPtr);
@@ -445,8 +499,9 @@ class iListableService: public iObject
 #endif
 public:
 		/* legacy interface: get a list */
-	virtual RESULT getContent(std::list<eServiceReference> &list)=0;
-	
+	virtual RESULT getContent(std::list<eServiceReference> &list, bool sorted=false)=0;
+	virtual RESULT getContent(PyObject *list, bool sorted=false)=0;
+
 		/* new, shiny interface: streaming. */
 	virtual SWIG_VOID(RESULT) getNext(eServiceReference &SWIG_OUTPUT)=0;