- add python, missing gui

 - remove console (needs to be rewritten anyway)
 - eString -> std::string

9 files changed, 44 insertions, 23 deletions

diff --git a/lib/service/iservice.h b/lib/service/iservice.h
index 253f8c3b..a6369574 100644
--- a/lib/service/iservice.h
+++ b/lib/service/iservice.h
@@ -2,7 +2,7 @@
 #define __lib_dvb_iservice_h
 
 #include <lib/base/object.h>
-#include <lib/base/estring.h>
+#include <string>
 #include <connection.h>
 #include <list>
 
@@ -41,7 +41,7 @@ public:
 	inline int getSortKey() const { return (flags & hasSortKey) ? data[3] : ((flags & sort1) ? 1 : 0); }
 
 	int data[8];
-	eString path;
+	std::string path;
 
 	eServiceReference()
 		: type(idInvalid), flags(0)
@@ -93,13 +93,13 @@ public:
 		data[3]=data3;
 		data[4]=data4;
 	}
-	eServiceReference(int type, int flags, const eString &path)
+	eServiceReference(int type, int flags, const std::string &path)
 		: type(type), flags(flags), path(path)
 	{
 		memset(data, 0, sizeof(data));
 	}
-	eServiceReference(const eString &string);
-	eString toString() const;
+	eServiceReference(const std::string &string);
+	std::string toString() const;
 	bool operator==(const eServiceReference &c) const
 	{
 		if (type != c.type)
@@ -137,9 +137,11 @@ public:
 class iServiceInformation: public iObject
 {
 public:
-	virtual RESULT getName(eString &name)=0;
+	virtual RESULT getName(std::string &name)=0;
 };
 
+typedef ePtr<iServiceInformation> iServiceInformationPtr;
+
 class iPauseableService: public iObject
 {
 public:
@@ -147,6 +149,8 @@ public:
 	virtual RESULT unpause()=0;
 };
 
+typedef ePtr<iPauseableService> iPauseableServicePtr;
+
 class iPlayableService: public iObject
 {
 	friend class iServiceHandler;
@@ -163,6 +167,8 @@ public:
 	virtual RESULT getIServiceInformation(ePtr<iServiceInformation> &ptr)=0;
 };
 
+typedef ePtr<iPlayableService> iPlayableServicePtr;
+
 class iRecordableService: public iObject
 {
 public:
@@ -170,12 +176,16 @@ public:
 	virtual RESULT stop()=0;
 };
 
+typedef ePtr<iRecordableService> iRecordableServicePtr;
+
 class iListableService: public iObject
 {
 public:
 	virtual RESULT getContent(std::list<eServiceReference> &list)=0;
 };
 
+typedef ePtr<iListableService> iListableServicePtr;
+
 class iServiceHandler: public iObject
 {
 public:
@@ -184,4 +194,6 @@ public:
 	virtual RESULT list(const eServiceReference &, ePtr<iListableService> &ptr)=0;
 };
 
+typedef ePtr<iServiceHandler> iServiceHandlerPtr;
+
 #endif
diff --git a/lib/service/service.cpp b/lib/service/service.cpp
index 8abf883f..d18b8eee 100644
--- a/lib/service/service.cpp
+++ b/lib/service/service.cpp
@@ -1,8 +1,10 @@
+#include <lib/base/eerror.h>
+#include <lib/base/estring.h>
 #include <lib/service/service.h>
 #include <lib/base/init_num.h>
 #include <lib/base/init.h>
 
-eServiceReference::eServiceReference(const eString &string)
+eServiceReference::eServiceReference(const std::string &string)
 {
 	const char *c=string.c_str();
 	int pathl=-1;
@@ -18,13 +20,16 @@ eServiceReference::eServiceReference(const eString &string)
 		path=c+pathl;
 }
 
-eString eServiceReference::toString() const
+std::string eServiceReference::toString() const
 {
-	eString ret;
-	ret+=eString().sprintf("%d:", type);
-	ret+=eString().sprintf("%d", flags);
+	std::string ret;
+	ret += getNum(type);
+	ret += ":";
+	ret += getNum(flags);
 	for (unsigned int i=0; i<sizeof(data)/sizeof(*data); ++i)
-		ret+=":"+eString().sprintf("%x", data[i]);
+	{
+		ret+=":"+ getNum(data[i], 0x10);
+	}
 	ret+=":"+path;
 	return ret;
 }
diff --git a/lib/service/service.h b/lib/service/service.h
index bd40fb08..fbe34278 100644
--- a/lib/service/service.h
+++ b/lib/service/service.h
@@ -5,23 +5,27 @@
 #include <lib/base/object.h>
 #include <lib/service/iservice.h>
 
+class eServiceCenter;
+
+typedef ePtr<eServiceCenter> eServiceCenterPtr;
+
 class eServiceCenter: public iServiceHandler
 {
 DECLARE_REF;
 private:
-	std::map<int,ePtr<iServiceHandler> > handler;
+	std::map<int,iServiceHandlerPtr> handler;
 	static eServiceCenter *instance;
 public:
 	eServiceCenter();
 	virtual ~eServiceCenter();
 
 		// iServiceHandler
-	RESULT play(const eServiceReference &, ePtr<iPlayableService> &ptr);
-	RESULT record(const eServiceReference &, ePtr<iRecordableService> &ptr);
-	RESULT list(const eServiceReference &, ePtr<iListableService> &ptr);
+	RESULT play(const eServiceReference &, iPlayableServicePtr &ptr);
+	RESULT record(const eServiceReference &, iRecordableServicePtr &ptr);
+	RESULT list(const eServiceReference &, iListableServicePtr &ptr);
 	
 		// eServiceCenter
-	static RESULT getInstance(ePtr<eServiceCenter> &ptr) { ptr = instance; return 0; }
+	static RESULT getInstance(eServiceCenterPtr &ptr) { ptr = instance; return 0; }
 	RESULT addServiceFactory(int id, iServiceHandler *hnd);
 	RESULT removeServiceFactory(int id);
 };
diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index cbf9a706..3b22ab7b 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -158,7 +158,7 @@ RESULT eDVBServicePlay::getIServiceInformation(ePtr<iServiceInformation> &ptr)
 	return 0;
 }
 
-RESULT eDVBServicePlay::getName(eString &name)
+RESULT eDVBServicePlay::getName(std::string &name)
 {
 	name = "DVB service";
 	return 0;
diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index 6e901483..42ca30f7 100644
--- a/lib/service/servicedvb.h
+++ b/lib/service/servicedvb.h
@@ -45,7 +45,7 @@ public:
 	RESULT getIServiceInformation(ePtr<iServiceInformation> &ptr);
 	
 		// iServiceInformation
-	RESULT getName(eString &name);
+	RESULT getName(std::string &name);
 };
 
 #endif
diff --git a/lib/service/servicefs.cpp b/lib/service/servicefs.cpp
index 4bdc11a9..f4a9b737 100644
--- a/lib/service/servicefs.cpp
+++ b/lib/service/servicefs.cpp
@@ -74,7 +74,7 @@ RESULT eServiceFS::getContent(std::list<eServiceReference> &list)
 		if (!(strcmp(e->d_name, ".") && strcmp(e->d_name, "..")))
 			continue;
 		
-		eString filename;
+		std::string filename;
 		
 		filename = path;
 		filename += e->d_name;
diff --git a/lib/service/servicefs.h b/lib/service/servicefs.h
index f98cbc4c..7e66ba21 100644
--- a/lib/service/servicefs.h
+++ b/lib/service/servicefs.h
@@ -21,7 +21,7 @@ class eServiceFS: public iListableService
 {
 DECLARE_REF;
 private:
-	eString path;
+	std::string path;
 	friend class eServiceFactoryFS;
 	eServiceFS(const char *path);
 public:
diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp
index 105ffbfa..d1c9001d 100644
--- a/lib/service/servicemp3.cpp
+++ b/lib/service/servicemp3.cpp
@@ -113,7 +113,7 @@ RESULT eServiceMP3::unpause() { printf("mp3 unpauses!\n"); return 0; }
 
 RESULT eServiceMP3::getIServiceInformation(ePtr<iServiceInformation>&i) { i = this; return 0; }
 
-RESULT eServiceMP3::getName(eString &name)
+RESULT eServiceMP3::getName(std::string &name)
 {
 	name = "MP3 File: " + filename;
 	return 0;
diff --git a/lib/service/servicemp3.h b/lib/service/servicemp3.h
index 940e141d..cfca4242 100644
--- a/lib/service/servicemp3.h
+++ b/lib/service/servicemp3.h
@@ -48,7 +48,7 @@ public:
 	RESULT getIServiceInformation(ePtr<iServiceInformation>&);
 	
 		// iServiceInformation
-	RESULT getName(eString &name);
+	RESULT getName(std::string &name);
 };
 
 #endif