From: ghost Date: Tue, 27 Oct 2009 23:43:32 +0000 (+0100) Subject: servicemp3.cpp: dont start pipeline in constructor, small cleanup X-Git-Tag: 2.6.0~5 X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/64de540e03c8ab04712797079e5fc76eb0135baa?hp=516b6790c6d6deca3138f8352ceb63f122edddc1 servicemp3.cpp: dont start pipeline in constructor, small cleanup --- diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp index 12959a0e..7701d4d5 100644 --- a/lib/service/servicemp3.cpp +++ b/lib/service/servicemp3.cpp @@ -335,7 +335,6 @@ eServiceMP3::eServiceMP3(eServiceReference ref) m_gst_playbin = 0; } - gst_element_set_state (m_gst_playbin, GST_STATE_PLAYING); setBufferSize(m_buffer_size); } @@ -355,7 +354,7 @@ eServiceMP3::~eServiceMP3() } } -DEFINE_REF(eServiceMP3); +DEFINE_REF(eServiceMP3); RESULT eServiceMP3::connectEvent(const Slot2 &event, ePtr &connection) { @@ -366,25 +365,30 @@ RESULT eServiceMP3::connectEvent(const Slot2 &event, RESULT eServiceMP3::start() { ASSERT(m_state == stIdle); - + m_state = stRunning; if (m_gst_playbin) { eDebug("eServiceMP3::starting pipeline"); gst_element_set_state (m_gst_playbin, GST_STATE_PLAYING); } + m_event(this, evStart); + return 0; } RESULT eServiceMP3::stop() { ASSERT(m_state != stIdle); + if (m_state == stStopped) return -1; + eDebug("eServiceMP3::stop %s", m_ref.path.c_str()); gst_element_set_state(m_gst_playbin, GST_STATE_NULL); m_state = stStopped; + return 0; }