X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/bbfcb7ea1f040d030277e2b6f2efa9ea0967bf2b..1a0088bffb8804bebd31ac6377656191684e4cae:/lib/service/servicemp3.cpp

diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp
index bbcb3b5c..80356dc5 100644
--- a/lib/service/servicemp3.cpp
+++ b/lib/service/servicemp3.cpp
@@ -40,6 +40,7 @@ eServiceFactoryMP3::eServiceFactoryMP3()
 		extensions.push_back("dat");
 		extensions.push_back("flac");
 		extensions.push_back("mp4");
+		extensions.push_back("mov");
 		extensions.push_back("m4a");
 		sc->addServiceFactory(eServiceFactoryMP3::id, this, extensions);
 	}
@@ -223,7 +224,7 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp
 		sourceinfo.containertype = ctAVI;
 		sourceinfo.is_video = TRUE;
 	}
-	else if ( strcasecmp(ext, ".mp4") == 0 )
+	else if ( strcasecmp(ext, ".mp4") == 0 || strcasecmp(ext, ".mov") == 0)
 	{
 		sourceinfo.containertype = ctMP4;
 		sourceinfo.is_video = TRUE;
@@ -321,11 +322,11 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp
 		switch (sourceinfo.containertype)
 		{
 			case ctMPEGTS:
-				demux_type = "flutsdemux";
+				demux_type = "mpegtsdemux";
 				break;
 			case ctMPEGPS:
 			case ctVCD:
-				demux_type = "flupsdemux";
+				demux_type = "mpegpsdemux";
 				break;
 			case ctMKV:
 				demux_type = "matroskademux";
@@ -620,7 +621,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_pipeline)
@@ -634,7 +635,7 @@ RESULT eServiceMP3::start()
 
 RESULT eServiceMP3::stop()
 {
-	assert(m_state != stIdle);
+	ASSERT(m_state != stIdle);
 	if (m_state == stStopped)
 		return -1;
 	eDebug("MP3: %s stop\n", m_filename.c_str());
@@ -695,6 +696,9 @@ void eServiceMP3::seekTimeoutCB()
 		// iPausableService
 RESULT eServiceMP3::pause()
 {
+	if (m_state != stRunning)
+		return;
+	
 	if (!m_gst_pipeline)
 		return -1;
 	GstStateChangeReturn res = gst_element_set_state(m_gst_pipeline, GST_STATE_PAUSED);
@@ -709,6 +713,9 @@ RESULT eServiceMP3::pause()
 
 RESULT eServiceMP3::unpause()
 {
+	if (m_state != stRunning)
+		return;
+
 	if (!m_gst_pipeline)
 		return -1;
 
@@ -838,6 +845,7 @@ int eServiceMP3::getInfo(int w)
 	case sGenre:
 	case sVideoType:
 	case sTimeCreate:
+	case sUser+10:
 	case sUser+12:
 		return resIsString;
 	case sCurrentTitle:
@@ -886,6 +894,9 @@ std::string eServiceMP3::getInfoString(int w)
 	case sGenre:
 		tag = GST_TAG_GENRE;
 		break;
+	case sUser+10:
+		tag = GST_TAG_AUDIO_CODEC;
+		break;
 	case sVideoType:
 		tag = GST_TAG_VIDEO_CODEC;
 		break;
@@ -1025,7 +1036,7 @@ void eServiceMP3::gstBusCall(GstBus *bus, GstMessage *msg)
 
 	source = GST_MESSAGE_SRC(msg);
 	sourceName = gst_object_get_name(source);
-#if 0
+#if 1
 	if (gst_message_get_structure(msg))
 	{
 		gchar *string = gst_structure_to_string(gst_message_get_structure(msg));
@@ -1050,8 +1061,13 @@ void eServiceMP3::gstBusCall(GstBus *bus, GstMessage *msg)
 			eWarning("Gstreamer error: %s (%i) from %s", err->message, err->code, sourceName );
 			if ( err->domain == GST_STREAM_ERROR )
 			{
-				if ( err->code == GST_STREAM_ERROR_CODEC_NOT_FOUND && g_strrstr(sourceName, "videosink") )
-					m_event((iPlayableService*)this, evUser+11);
+				if ( err->code == GST_STREAM_ERROR_CODEC_NOT_FOUND )
+				{
+					if ( g_strrstr(sourceName, "videosink") )
+						m_event((iPlayableService*)this, evUser+11);
+					else if ( g_strrstr(sourceName, "audiosink") )
+						m_event((iPlayableService*)this, evUser+10);
+				}
 				else if ( err->code == GST_STREAM_ERROR_FAILED && g_strrstr(sourceName, "file-source") )
 				{
 					eWarning("error in tag parsing, linking mp3parse directly to file-sink, bypassing id3demux...");