X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4bc08995411e21f3564f09e136809be68ddf96a8..3af66122574386a2856e83ba9c5d73d27a6f3710:/lib/service/servicemp3.h

diff --git a/lib/service/servicemp3.h b/lib/service/servicemp3.h
index 7ef84025..4bec7365 100644
--- a/lib/service/servicemp3.h
+++ b/lib/service/servicemp3.h
@@ -3,11 +3,11 @@
 
 #include <lib/service/iservice.h>
 
-class eServiceMP3Info ;
+class eStaticServiceMP3Info;
 
 class eServiceFactoryMP3: public iServiceHandler
 {
-DECLARE_REF;
+DECLARE_REF(eServiceFactoryMP3);
 public:
 	eServiceFactoryMP3();
 	virtual ~eServiceFactoryMP3();
@@ -17,23 +17,23 @@ public:
 	RESULT play(const eServiceReference &, ePtr<iPlayableService> &ptr);
 	RESULT record(const eServiceReference &, ePtr<iRecordableService> &ptr);
 	RESULT list(const eServiceReference &, ePtr<iListableService> &ptr);
-	RESULT info(const eServiceReference &, ePtr<iServiceInformation> &ptr);
+	RESULT info(const eServiceReference &, ePtr<iStaticServiceInformation> &ptr);
 private:
-	ePtr<eServiceMP3Info> m_service_info;
+	ePtr<eStaticServiceMP3Info> m_service_info;
 };
 
-class eServiceMP3Info: public iServiceInformation
+class eStaticServiceMP3Info: public iServiceInformation
 {
-	DECLARE_REF;
+	DECLARE_REF(eStaticServiceMP3Info);
 	friend class eServiceFactoryMP3;
-	eServiceMP3Info();
+	eStaticServiceMP3Info();
 public:
 	RESULT getName(const eServiceReference &ref, std::string &name);
 };
 
 class eServiceMP3: public iPlayableService, public iPauseableService, public iServiceInformation, public Object
 {
-DECLARE_REF;
+DECLARE_REF(eServiceMP3);
 private:
 	friend class eServiceFactoryMP3;
 	std::string filename;
@@ -53,13 +53,13 @@ public:
 	RESULT connectEvent(const Slot2<void,iPlayableService*,int> &event, ePtr<eConnection> &connection);
 	RESULT start();
 	RESULT stop();
-	RESULT getIPausableService(ePtr<iPauseableService> &ptr);
+	RESULT pause(ePtr<iPauseableService> &ptr);
 
 		// iPausableService
 	RESULT pause();
 	RESULT unpause();
 	
-	RESULT getIServiceInformation(ePtr<iServiceInformation>&);
+	RESULT info(ePtr<iServiceInformation>&);
 	
 		// iServiceInformation
 	RESULT getName(const eServiceReference &ref, std::string &name);