diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2009-04-24 19:15:59 +0200 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2009-04-24 19:15:59 +0200 |
| commit | b94a5364df3ca40511efe11e2723128ff333fc96 (patch) | |
| tree | 6c4c55651f04548202088a76fc335197108a987f /lib/service/servicemp3.cpp | |
| parent | 019ba406ed5ba46782951d501ed2d4c0a96e6096 (diff) | |
| download | enigma2-b94a5364df3ca40511efe11e2723128ff333fc96.tar.gz enigma2-b94a5364df3ca40511efe11e2723128ff333fc96.zip | |
servicemp3.cpp: redo reverted fixes (removed during gstreamer decodebin2 merge)
Diffstat (limited to 'lib/service/servicemp3.cpp')
| -rw-r--r-- | lib/service/servicemp3.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp index e33425d4..f8eb194e 100644 --- a/lib/service/servicemp3.cpp +++ b/lib/service/servicemp3.cpp @@ -354,7 +354,7 @@ RESULT eServiceMP3::connectEvent(const Slot2<void,iPlayableService*,int> &event, RESULT eServiceMP3::start() { - assert(m_state == stIdle); + ASSERT(m_state == stIdle); m_state = stRunning; if (m_gst_playbin) @@ -368,7 +368,7 @@ RESULT eServiceMP3::start() RESULT eServiceMP3::stop() { - assert(m_state != stIdle); + ASSERT(m_state != stIdle); if (m_state == stStopped) return -1; eDebug("eServiceMP3::stop %s", m_filename.c_str()); @@ -427,7 +427,7 @@ void eServiceMP3::seekTimeoutCB() // iPausableService RESULT eServiceMP3::pause() { - if (!m_gst_playbin) + if (!m_gst_playbin || m_state != stRunning) return -1; GstStateChangeReturn res = gst_element_set_state(m_gst_playbin, GST_STATE_PAUSED); if (res == GST_STATE_CHANGE_ASYNC) @@ -441,7 +441,7 @@ RESULT eServiceMP3::pause() RESULT eServiceMP3::unpause() { - if (!m_gst_playbin) + if (!m_gst_playbin || m_state != stRunning) return -1; GstStateChangeReturn res; |