git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
also use refcounting for eTimers
[enigma2.git]
/
lib
/
service
/
servicemp3.cpp
diff --git
a/lib/service/servicemp3.cpp
b/lib/service/servicemp3.cpp
index 1778e5bba4ecec03bea78de5d44808c98ecd1441..a453f54f961535d67a72bf42ffb1741f4ed434cb 100644
(file)
--- a/
lib/service/servicemp3.cpp
+++ b/
lib/service/servicemp3.cpp
@@
-174,14
+174,13
@@
int eStaticServiceMP3Info::getLength(const eServiceReference &ref)
eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eApp, 1)
{
eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eApp, 1)
{
+ m_seekTimeout = eTimer::create(eApp);
m_stream_tags = 0;
m_stream_tags = 0;
- m_audioStreams.clear();
- m_subtitleStreams.clear();
m_currentAudioStream = 0;
m_currentSubtitleStream = 0;
m_subtitle_widget = 0;
m_currentTrickRatio = 0;
m_currentAudioStream = 0;
m_currentSubtitleStream = 0;
m_subtitle_widget = 0;
m_currentTrickRatio = 0;
- CONNECT(m_seekTimeout
.
timeout, eServiceMP3::seekTimeoutCB);
+ CONNECT(m_seekTimeout
->
timeout, eServiceMP3::seekTimeoutCB);
CONNECT(m_pump.recv_msg, eServiceMP3::gstPoll);
GstElement *source = 0;
CONNECT(m_pump.recv_msg, eServiceMP3::gstPoll);
GstElement *source = 0;
@@
-527,9
+526,9
@@
RESULT eServiceMP3::setFastForward(int ratio)
{
m_currentTrickRatio = ratio;
if (ratio)
{
m_currentTrickRatio = ratio;
if (ratio)
- m_seekTimeout
.
start(1000, 0);
+ m_seekTimeout
->
start(1000, 0);
else
else
- m_seekTimeout
.
stop();
+ m_seekTimeout
->
stop();
return 0;
}
return 0;
}
@@
-543,13
+542,13
@@
void eServiceMP3::seekTimeoutCB()
if (ppos < 0)
{
ppos = 0;
if (ppos < 0)
{
ppos = 0;
- m_seekTimeout
.
stop();
+ m_seekTimeout
->
stop();
}
if (ppos > len)
{
ppos = 0;
stop();
}
if (ppos > len)
{
ppos = 0;
stop();
- m_seekTimeout
.
stop();
+ m_seekTimeout
->
stop();
return;
}
seekTo(ppos);
return;
}
seekTo(ppos);