From: Andreas Frisch <andreas.frisch@multimedia-labs.de>
Date: Thu, 2 Oct 2008 11:31:54 +0000 (+0000)
Subject: allow MediaPlayer AudioCD playback only for what appear to be AudioCDs
X-Git-Tag: 2.6.0~827
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/ab26adc86e6198e65e20d6bf707a6011208111ce

allow MediaPlayer AudioCD playback only for what appear to be AudioCDs
---

diff --git a/lib/python/Components/Scanner.py b/lib/python/Components/Scanner.py
index 69237bc0..f7e307b7 100644
--- a/lib/python/Components/Scanner.py
+++ b/lib/python/Components/Scanner.py
@@ -126,6 +126,14 @@ def scanDevice(mountpoint):
 
 	# convert to list
 	paths_to_scan = list(paths_to_scan)
+	
+	from Components.Harddisk import HarddiskManager	
+	class CdromManager(HarddiskManager):
+		def __init__(self):
+			pass
+	cdaman = CdromManager()
+	blockdev = mountpoint.split('/')[2]
+	error, blacklisted, removable, is_cdrom, partitions = cdaman.getBlockDevInfo(blockdev)
 
 	# now scan the paths
 	for p in paths_to_scan:
@@ -133,7 +141,11 @@ def scanDevice(mountpoint):
 
 		for root, dirs, files in os_walk(path):
 			for f in files:
-				sfile = ScanFile(os_path.join(root, f))
+				path = os_path.join(root, f)
+				if is_cdrom and path.endswith(".wav") and path[-13:-6] == ("/track-"):
+					sfile = ScanFile(path,"audio/x-cda")
+				else:
+					sfile = ScanFile(path)
 				for s in scanner:
 					s.handleFile(res, sfile)
 
diff --git a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
index f819d782..752a036b 100644
--- a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
@@ -848,7 +848,8 @@ def filescan(**kwargs):
 		)]
 	try:
 		from Plugins.Extensions.CDInfo.plugin import Query
-		mediatypes.insert(0,Scanner(mimetypes = ["audio/x-cda", "audio/x-wav"],
+		mediatypes.append(
+		Scanner(mimetypes = ["audio/x-cda"],
 			paths_to_scan =
 				[
 					ScanPath(path = "", with_subdirs = False),