From ddc3964ed95d01e72229dc9af968a327cd84e56c Mon Sep 17 00:00:00 2001 From: Felix Domke Date: Fri, 1 Oct 2004 13:21:35 +0000 Subject: - add python, missing gui - remove console (needs to be rewritten anyway) - eString -> std::string --- lib/service/iservice.h | 24 ++++++++++++++++++------ lib/service/service.cpp | 17 +++++++++++------ lib/service/service.h | 14 +++++++++----- lib/service/servicedvb.cpp | 2 +- lib/service/servicedvb.h | 2 +- lib/service/servicefs.cpp | 2 +- lib/service/servicefs.h | 2 +- lib/service/servicemp3.cpp | 2 +- lib/service/servicemp3.h | 2 +- 9 files changed, 44 insertions(+), 23 deletions(-) (limited to 'lib/service') 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 -#include +#include #include #include @@ -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 iServiceInformationPtr; + class iPauseableService: public iObject { public: @@ -147,6 +149,8 @@ public: virtual RESULT unpause()=0; }; +typedef ePtr iPauseableServicePtr; + class iPlayableService: public iObject { friend class iServiceHandler; @@ -163,6 +167,8 @@ public: virtual RESULT getIServiceInformation(ePtr &ptr)=0; }; +typedef ePtr iPlayableServicePtr; + class iRecordableService: public iObject { public: @@ -170,12 +176,16 @@ public: virtual RESULT stop()=0; }; +typedef ePtr iRecordableServicePtr; + class iListableService: public iObject { public: virtual RESULT getContent(std::list &list)=0; }; +typedef ePtr iListableServicePtr; + class iServiceHandler: public iObject { public: @@ -184,4 +194,6 @@ public: virtual RESULT list(const eServiceReference &, ePtr &ptr)=0; }; +typedef ePtr 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 +#include #include #include #include -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 #include +class eServiceCenter; + +typedef ePtr eServiceCenterPtr; + class eServiceCenter: public iServiceHandler { DECLARE_REF; private: - std::map > handler; + std::map handler; static eServiceCenter *instance; public: eServiceCenter(); virtual ~eServiceCenter(); // iServiceHandler - RESULT play(const eServiceReference &, ePtr &ptr); - RESULT record(const eServiceReference &, ePtr &ptr); - RESULT list(const eServiceReference &, ePtr &ptr); + RESULT play(const eServiceReference &, iPlayableServicePtr &ptr); + RESULT record(const eServiceReference &, iRecordableServicePtr &ptr); + RESULT list(const eServiceReference &, iListableServicePtr &ptr); // eServiceCenter - static RESULT getInstance(ePtr &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 &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 &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 &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&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 - RESULT getName(eString &name); + RESULT getName(std::string &name); }; #endif -- cgit v1.2.3