add audioselection, removed democode

[enigma2.git] / lib / service / servicemp3.cpp

diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp
index 549a288ad3dc378b6d31e9a6b8dfb7c09ec2e6c6..dc038a852eb4d0259cc871b6a041b9d2b7cd6812 100644 (file)
--- a/lib/service/servicemp3.cpp
+++ b/lib/service/servicemp3.cpp
@@ -13,7 +13,7 @@ eServiceFactoryMP3::eServiceFactoryMP3()
 {
        ePtr<eServiceCenter> sc;
        
 {
        ePtr<eServiceCenter> sc;
        

-       eServiceCenter::getInstance(sc);
+       eServiceCenter::getPrivInstance(sc);

        if (sc)
                sc->addServiceFactory(eServiceFactoryMP3::id, this);
 
        if (sc)
                sc->addServiceFactory(eServiceFactoryMP3::id, this);
 


@@ -24,7 +24,7 @@ eServiceFactoryMP3::~eServiceFactoryMP3()
 {
        ePtr<eServiceCenter> sc;
        
 {
        ePtr<eServiceCenter> sc;
        

-       eServiceCenter::getInstance(sc);
+       eServiceCenter::getPrivInstance(sc);

        if (sc)
                sc->removeServiceFactory(eServiceFactoryMP3::id);
 }
        if (sc)
                sc->removeServiceFactory(eServiceFactoryMP3::id);
 }


@@ -57,6 +57,13 @@ RESULT eServiceFactoryMP3::info(const eServiceReference &ref, ePtr<iStaticServic
        return 0;
 }
 
        return 0;
 }
 

+RESULT eServiceFactoryMP3::offlineOperations(const eServiceReference &, ePtr<iServiceOfflineOperations> &ptr)
+{
+       ptr = 0;
+       return -1;
+}
+
+

 // eStaticServiceMP3Info
 
 
 // eStaticServiceMP3Info
 
 


@@ -142,6 +149,8 @@ RESULT eServiceMP3::stop()
 RESULT eServiceMP3::pause(ePtr<iPauseableService> &ptr) { ptr=this; return 0; }
 RESULT eServiceMP3::seek(ePtr<iSeekableService> &ptr) { ptr = 0; return -1; }
 
 RESULT eServiceMP3::pause(ePtr<iPauseableService> &ptr) { ptr=this; return 0; }
 RESULT eServiceMP3::seek(ePtr<iSeekableService> &ptr) { ptr = 0; return -1; }
 

+RESULT eServiceMP3::audioTracks(ePtr<iAudioTrackSelection> &ptr) { ptr = 0; return -1; };
+

                // iPausableService
 RESULT eServiceMP3::pause() { printf("mp3 pauses!\n"); return 0; }
 RESULT eServiceMP3::unpause() { printf("mp3 unpauses!\n"); return 0; }
                // iPausableService
 RESULT eServiceMP3::pause() { printf("mp3 pauses!\n"); return 0; }
 RESULT eServiceMP3::unpause() { printf("mp3 unpauses!\n"); return 0; }