X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/3353982034f151f4615cb1842873d99a7a6fa0ca..391f7559e77cf98ea3b5a1fba94a8fa6f4307da8:/lib/service/iservice.h

diff --git a/lib/service/iservice.h b/lib/service/iservice.h
index 376ed027..dfd06693 100644
--- a/lib/service/iservice.h
+++ b/lib/service/iservice.h
@@ -3,6 +3,7 @@
 
 #include <lib/python/swig.h>
 #include <lib/base/object.h>
+#include <lib/service/event.h>
 #include <string>
 #include <connection.h>
 #include <list>
@@ -43,10 +44,12 @@ public:
 
 	int data[8];
 	std::string path;
+	std::string getPath() { return 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;
+	std::string getName() { return name; }
 
 	eServiceReference()
 		: type(idInvalid), flags(0)
@@ -109,7 +112,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
 	{
@@ -122,11 +125,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)
@@ -146,7 +144,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
@@ -175,7 +173,10 @@ public:
 	virtual SWIG_VOID(RESULT) getName(const eServiceReference &ref, std::string &SWIG_OUTPUT)=0;
 	
 		// doesn't need to be implemented, should return -1 then.
-	virtual int getLength(const eServiceReference &ref)=0;
+	virtual int getLength(const eServiceReference &ref);
+	virtual SWIG_VOID(RESULT) getEvent(const eServiceReference &ref, ePtr<eServiceEvent> &SWIG_OUTPUT);
+		// returns true when not implemented
+	virtual bool isPlayable(const eServiceReference &ref, const eServiceReference &ignore);
 };
 
 TEMPLATE_TYPEDEF(ePtr<iStaticServiceInformation>, iStaticServiceInformationPtr);
@@ -189,10 +190,53 @@ class iServiceInformation: public iObject
 public:
 	virtual SWIG_VOID(RESULT) getName(std::string &SWIG_OUTPUT)=0;
 	virtual SWIG_VOID(RESULT) getEvent(ePtr<eServiceEvent> &SWIG_OUTPUT, int nownext);
+
+	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) */
+		
+			/* "user serviceable info" - they are not reliable. Don't use them for anything except the service menu!
+			   that's also the reason why they are so globally defined. 
+			   
+			   
+			   again - if somebody EVER tries to use this information for anything else than simply displaying it,
+			   i will change this to return a user-readable text like "zero x zero three three" (and change the
+			   exact spelling in every version) to stop that!
+			*/
+		sVideoPID,
+		sAudioPID,
+		sPCRPID,
+		sPMTPID,
+		sTXTPID,
+		
+		sSID,
+		sONID,
+		sTSID,
+		sNamespace,
+		sProvider,
+	};
+	enum { resNA = -1, resIsString = -2 };
+
+	virtual int getInfo(int w);
+	virtual std::string getInfoString(int w);
 };
 
 TEMPLATE_TYPEDEF(ePtr<iServiceInformation>, iServiceInformationPtr);
 
+class iFrontendStatusInformation: public iObject
+{
+public:
+	enum {
+		bitErrorRate,
+		signalPower,
+		signalQuality
+	};
+	virtual int getFrontendInfo(int w)=0;
+};
+
+TEMPLATE_TYPEDEF(ePtr<iFrontendStatusInformation>, iFrontendStatusInformationPtr);
+
 class iPauseableService: public iObject
 {
 public:
@@ -217,7 +261,10 @@ TEMPLATE_TYPEDEF(ePtr<iSeekableService>, iSeekableServicePtr);
 struct iAudioTrackInfo
 {
 	std::string m_description;
+	std::string m_language; /* iso639 */
+	
 	std::string getDescription() { return m_description; }
+	std::string getLanguage() { return m_language; }
 };
 
 SWIG_ALLOW_OUTPUT_SIMPLE(iAudioTrackInfo);
@@ -242,8 +289,9 @@ public:
 		evEnd,
 		
 		evTuneFailed,
-		// when iServiceInformation is implemented:
-		evUpdatedEventInfo
+			// when iServiceInformation is implemented:
+		evUpdatedEventInfo,
+		evUpdatedInfo,
 	};
 	virtual RESULT connectEvent(const Slot2<void,iPlayableService*,int> &event, ePtr<eConnection> &connection)=0;
 	virtual RESULT start()=0;
@@ -252,6 +300,7 @@ 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) frontendStatusInfo(ePtr<iFrontendStatusInformation> &SWIG_OUTPUT)=0;
 };
 
 TEMPLATE_TYPEDEF(ePtr<iPlayableService>, iPlayableServicePtr);