git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
display remaining time for next event
[enigma2.git]
/
lib
/
service
/
servicemp3.cpp
diff --git
a/lib/service/servicemp3.cpp
b/lib/service/servicemp3.cpp
index 1f883f944bfcf3632c83cba7098e37cb6da76b5b..ce81b3115cc1c6089712b16dbac868bbe1af1582 100644
(file)
--- a/
lib/service/servicemp3.cpp
+++ b/
lib/service/servicemp3.cpp
@@
-13,18
+13,18
@@
eServiceFactoryMP3::eServiceFactoryMP3()
{
ePtr<eServiceCenter> sc;
{
ePtr<eServiceCenter> sc;
- eServiceCenter::getInstance(sc);
+ eServiceCenter::get
Priv
Instance(sc);
if (sc)
sc->addServiceFactory(eServiceFactoryMP3::id, this);
if (sc)
sc->addServiceFactory(eServiceFactoryMP3::id, this);
- m_service_info = new eServiceMP3Info();
+ m_service_info = new eS
taticS
erviceMP3Info();
}
eServiceFactoryMP3::~eServiceFactoryMP3()
{
ePtr<eServiceCenter> sc;
}
eServiceFactoryMP3::~eServiceFactoryMP3()
{
ePtr<eServiceCenter> sc;
- eServiceCenter::getInstance(sc);
+ eServiceCenter::get
Priv
Instance(sc);
if (sc)
sc->removeServiceFactory(eServiceFactoryMP3::id);
}
if (sc)
sc->removeServiceFactory(eServiceFactoryMP3::id);
}
@@
-51,34
+51,46
@@
RESULT eServiceFactoryMP3::list(const eServiceReference &, ePtr<iListableService
return -1;
}
return -1;
}
-RESULT eServiceFactoryMP3::info(const eServiceReference &ref, ePtr<iServiceInformation> &ptr)
+RESULT eServiceFactoryMP3::info(const eServiceReference &ref, ePtr<iS
taticS
erviceInformation> &ptr)
{
ptr = m_service_info;
return 0;
}
{
ptr = m_service_info;
return 0;
}
-// eServiceMP3Info
+RESULT eServiceFactoryMP3::offlineOperations(const eServiceReference &, ePtr<iServiceOfflineOperations> &ptr)
+{
+ ptr = 0;
+ return -1;
+}
+
+// eStaticServiceMP3Info
-// eServiceMP3Info is seperated from eServiceMP3 to give information
+
+// eStaticServiceMP3Info is seperated from eServiceMP3 to give information
// about unopened files.
// about unopened files.
-// probably eServiceMP3 should use this class as well, and eServiceMP3Info
+// probably eServiceMP3 should use this class as well, and eS
taticS
erviceMP3Info
// should have a database backend where ID3-files etc. are cached.
// this would allow listing the mp3 database based on certain filters.
// should have a database backend where ID3-files etc. are cached.
// this would allow listing the mp3 database based on certain filters.
-DEFINE_REF(eServiceMP3Info)
+DEFINE_REF(eS
taticS
erviceMP3Info)
-eS
erviceMP3Info::e
ServiceMP3Info()
+eS
taticServiceMP3Info::eStatic
ServiceMP3Info()
{
}
{
}
-RESULT eServiceMP3Info::getName(const eServiceReference &ref, std::string &name)
+RESULT eS
taticS
erviceMP3Info::getName(const eServiceReference &ref, std::string &name)
{
name = "MP3 file: " + ref.path;
return 0;
}
{
name = "MP3 file: " + ref.path;
return 0;
}
+int eStaticServiceMP3Info::getLength(const eServiceReference &ref)
+{
+ return -1;
+}
+
// eServiceMP3
void eServiceMP3::test_end()
// eServiceMP3
void eServiceMP3::test_end()
@@
-130,19
+142,46
@@
RESULT eServiceMP3::stop()
test.stop();
printf("MP3: %s stop\n", filename.c_str());
m_state = stStopped;
test.stop();
printf("MP3: %s stop\n", filename.c_str());
m_state = stStopped;
- m_event(this, evE
nd
);
+ m_event(this, evE
OF
);
return 0;
}
return 0;
}
-RESULT eServiceMP3::getIPausableService(ePtr<iPauseableService> &ptr) { ptr=this; return 0; }
+RESULT eServiceMP3::pause(ePtr<iPauseableService> &ptr)
+{
+ ptr=this;
+ return 0;
+}
+RESULT eServiceMP3::setSlowMotion(int ratio)
+{
+ return -1;
+}
+
+RESULT eServiceMP3::setFastForward(int ratio)
+{
+ return -1;
+}
+
// iPausableService
// iPausableService
-RESULT eServiceMP3::pause() { printf("mp3 pauses!\n"); return 0; }
-RESULT eServiceMP3::unpause() { printf("mp3 unpauses!\n"); return 0; }
+RESULT eServiceMP3::pause()
+{
+ printf("mp3 pauses!\n");
+ return 0;
+}
-RESULT eServiceMP3::getIServiceInformation(ePtr<iServiceInformation>&i) { i = this; return 0; }
+RESULT eServiceMP3::unpause()
+{
+ printf("mp3 unpauses!\n");
+ return 0;
+}
+
+RESULT eServiceMP3::info(ePtr<iServiceInformation>&i)
+{
+ i = this;
+ return 0;
+}
-RESULT eServiceMP3::getName(
const eServiceReference &ref,
std::string &name)
+RESULT eServiceMP3::getName(std::string &name)
{
name = "MP3 File: " + filename;
return 0;
{
name = "MP3 File: " + filename;
return 0;