From: Andreas Frisch <andreas.frisch@multimedia-labs.de>
Date: Fri, 3 Oct 2008 20:52:50 +0000 (+0000)
Subject: Allow playback of VCD (Video CD) and SVCD
X-Git-Tag: 2.6.0~818
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/f51d97f3ee2b0121ffe1fe789ca58c089408b980?ds=sidebyside

Allow playback of VCD (Video CD) and SVCD
---

diff --git a/lib/python/Components/Scanner.py b/lib/python/Components/Scanner.py
index f7e307b7..c217aa5c 100644
--- a/lib/python/Components/Scanner.py
+++ b/lib/python/Components/Scanner.py
@@ -32,6 +32,8 @@ def getType(file):
 			return "video/x-dvd-iso"
 		elif file[-12:].lower() == "video_ts.ifo":
 			return "video/x-dvd"
+		elif ext == "dat" and file[-11:-6].lower() == "avseq":
+			return "video/x-vcd"
 	return type
 
 class Scanner:
diff --git a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
index c4282a07..25491b67 100644
--- a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
@@ -843,6 +843,15 @@ def filescan(**kwargs):
 			description = "View Movies...",
 			openfnc = filescan_open,
 		),
+		Scanner(mimetypes = ["video/x-vcd"],
+			paths_to_scan =
+				[
+					ScanPath(path = "mpegav", with_subdirs = False),
+				],
+			name = "Video CD",
+			description = "View Video CD...",
+			openfnc = filescan_open,
+		),
 		Scanner(mimetypes = ["audio/mpeg", "audio/x-wav", "application/ogg"],
 			paths_to_scan =
 				[
diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp
index 25c52933..0197d26f 100644
--- a/lib/service/servicemp3.cpp
+++ b/lib/service/servicemp3.cpp
@@ -195,7 +195,7 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp
 	if (!ext)
 		ext = filename;
 
-	int is_mpeg_ps = !(strcasecmp(ext, ".mpeg") && strcasecmp(ext, ".mpg") && strcasecmp(ext, ".vob") && strcasecmp(ext, ".bin"));
+	int is_mpeg_ps = !(strcasecmp(ext, ".mpeg") && strcasecmp(ext, ".mpg") && strcasecmp(ext, ".vob") && strcasecmp(ext, ".bin") && strcasecmp(ext, ".dat"));
 	int is_mpeg_ts = !strcasecmp(ext, ".ts");
 	int is_matroska = !strcasecmp(ext, ".mkv");
 	int is_avi = !strcasecmp(ext, ".avi");
@@ -1092,7 +1092,6 @@ void eServiceMP3::gstCBsubtitleAvail(GstElement *element, GstBuffer *buffer, Gst
 	}
 	else
 		eDebug("on inactive element: %s (%p) saw subtitle: %s",sourceName, element, text);
-	return TRUE;
 }
 
 RESULT eServiceMP3::enableSubtitles(eWidget *parent, ePyObject tuple)