From: ghost <andreas.monzner@multimedia-labs.de>
Date: Fri, 24 Apr 2009 17:15:59 +0000 (+0200)
Subject: servicemp3.cpp: redo reverted fixes (removed during gstreamer decodebin2 merge)
X-Git-Tag: 2.6.0~329
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/b94a5364df3ca40511efe11e2723128ff333fc96?hp=019ba406ed5ba46782951d501ed2d4c0a96e6096

servicemp3.cpp: redo reverted fixes (removed during gstreamer decodebin2 merge)
---

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;