X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/68c9ea1ffaba4d6a45833744e0270db4c7eb0486..2026a6353de4bb4f8586b47963282b8eb14114b1:/lib/service/servicemp3.cpp

diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp
index 93d2ec7e..47511f78 100644
--- a/lib/service/servicemp3.cpp
+++ b/lib/service/servicemp3.cpp
@@ -37,6 +37,7 @@ eServiceFactoryMP3::eServiceFactoryMP3()
 		extensions.push_back("vob");
 		extensions.push_back("wav");
 		extensions.push_back("wave");
+		extensions.push_back("m4v");
 		extensions.push_back("mkv");
 		extensions.push_back("avi");
 		extensions.push_back("divx");
@@ -188,6 +189,25 @@ int eStaticServiceMP3Info::getLength(const eServiceReference &ref)
 	return -1;
 }
 
+int eStaticServiceMP3Info::getInfo(const eServiceReference &ref, int w)
+{
+	switch (w)
+	{
+	case iServiceInformation::sTimeCreate:
+	{
+		struct stat s;
+		if(stat(ref.path.c_str(), &s) == 0)
+		{
+		  return s.st_mtime;
+		}
+		return iServiceInformation::resNA;
+	}
+	default: break;
+	}
+	return iServiceInformation::resNA;
+}
+ 
+
 // eServiceMP3
 int eServiceMP3::ac3_delay,
     eServiceMP3::pcm_delay;
@@ -240,7 +260,7 @@ eServiceMP3::eServiceMP3(eServiceReference ref)
 		sourceinfo.containertype = ctAVI;
 		sourceinfo.is_video = TRUE;
 	}
-	else if ( strcasecmp(ext, ".mp4") == 0 || strcasecmp(ext, ".mov") == 0)
+	else if ( strcasecmp(ext, ".mp4") == 0 || strcasecmp(ext, ".mov") == 0 || strcasecmp(ext, ".m4v") == 0)
 	{
 		sourceinfo.containertype = ctMP4;
 		sourceinfo.is_video = TRUE;
@@ -1602,23 +1622,33 @@ int eServiceMP3::getPCMDelay()
 
 void eServiceMP3::setAC3Delay(int delay)
 {
+	ac3_delay = delay;
 	if (!m_gst_playbin || m_state != stRunning)
 		return;
 	else
 	{
 		GstElement *sink;
-		std::string config_delay;
 		int config_delay_int = delay;
-		if(ePythonConfigQuery::getConfigValue("config.av.generalAC3delay", config_delay) == 0)
-			config_delay_int += atoi(config_delay.c_str());
+		g_object_get (G_OBJECT (m_gst_playbin), "video-sink", &sink, NULL);
+
+		if (sink)
+		{
+			std::string config_delay;
+			if(ePythonConfigQuery::getConfigValue("config.av.generalAC3delay", config_delay) == 0)
+				config_delay_int += atoi(config_delay.c_str());
+			gst_object_unref(sink);
+		}
+		else
+		{
+			eDebug("dont apply ac3 delay when no video is running!");
+			config_delay_int = 0;
+		}
 
 		g_object_get (G_OBJECT (m_gst_playbin), "audio-sink", &sink, NULL);
 
-		if (!sink)
-			return;
-		else {
+		if (sink)
+		{
 			gchar *name = gst_element_get_name(sink);
-
 			if (strstr(name, "dvbaudiosink"))
 				eTSMPEGDecoder::setHwAC3Delay(config_delay_int);
 			g_free(name);
@@ -1629,26 +1659,37 @@ void eServiceMP3::setAC3Delay(int delay)
 
 void eServiceMP3::setPCMDelay(int delay)
 {
+	pcm_delay = delay;
 	if (!m_gst_playbin || m_state != stRunning)
 		return;
 	else
 	{
 		GstElement *sink;
-		std::string config_delay;
 		int config_delay_int = delay;
-		if(ePythonConfigQuery::getConfigValue("config.av.generalPCMdelay", config_delay) == 0)
-			config_delay_int += atoi(config_delay.c_str());
+		g_object_get (G_OBJECT (m_gst_playbin), "video-sink", &sink, NULL);
+
+		if (sink)
+		{
+			std::string config_delay;
+			if(ePythonConfigQuery::getConfigValue("config.av.generalPCMdelay", config_delay) == 0)
+				config_delay_int += atoi(config_delay.c_str());
+			gst_object_unref(sink);
+		}
+		else
+		{
+			eDebug("dont apply pcm delay when no video is running!");
+			config_delay_int = 0;
+		}
 
 		g_object_get (G_OBJECT (m_gst_playbin), "audio-sink", &sink, NULL);
 
-		if (!sink)
-			return;
-		else {
+		if (sink)
+		{
 			gchar *name = gst_element_get_name(sink);
-
 			if (strstr(name, "dvbaudiosink"))
 				eTSMPEGDecoder::setHwPCMDelay(config_delay_int);
-			else {
+			else
+			{
 				// this is realy untested..and not used yet
 				gint64 offset = config_delay_int;
 				offset *= 1000000; // milli to nano