From b94a5364df3ca40511efe11e2723128ff333fc96 Mon Sep 17 00:00:00 2001 From: ghost Date: Fri, 24 Apr 2009 19:15:59 +0200 Subject: [PATCH] servicemp3.cpp: redo reverted fixes (removed during gstreamer decodebin2 merge) --- lib/service/servicemp3.cpp | 8 ++++---- 1 file 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 &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; -- 2.30.2