X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fservice%2Fservicemp3.cpp;h=7701d4d570a01c1683fab40b36e0d263f36b442e;hp=16ca8287877e93950509ee554bca9aad2b5169aa;hb=64de540e03c8ab04712797079e5fc76eb0135baa;hpb=094cf48fe4d7edeb108b7fc6070ae43fac79c1f3

diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp
index 16ca828..7701d4d 100644
--- a/lib/service/servicemp3.cpp
+++ b/lib/service/servicemp3.cpp
@@ -194,7 +194,7 @@ eServiceMP3::eServiceMP3(eServiceReference ref)
 	m_seekTimeout = eTimer::create(eApp);
 	m_subtitle_sync_timer = eTimer::create(eApp);
 	m_stream_tags = 0;
-	m_currentAudioStream = 0;
+	m_currentAudioStream = -1;
 	m_currentSubtitleStream = 0;
 	m_subtitle_widget = 0;
 	m_currentTrickRatio = 0;
@@ -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<void,iPlayableService*,int> &event, ePtr<eConnection> &connection)
 {
@@ -366,25 +365,30 @@ RESULT eServiceMP3::connectEvent(const Slot2<void,iPlayableService*,int> &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;
 }
 
@@ -945,6 +949,8 @@ int eServiceMP3::getNumberOfTracks()
 
 int eServiceMP3::getCurrentTrack()
 {
+	if (m_currentAudioStream == -1)
+		g_object_get (G_OBJECT (m_gst_playbin), "current-audio", &m_currentAudioStream, NULL);
 	return m_currentAudioStream;
 }