allow MediaPlayer AudioCD playback only for what appear to be AudioCDs

[enigma2.git] / lib / python / Components / Scanner.py

diff --git a/lib/python/Components/Scanner.py b/lib/python/Components/Scanner.py
index 69237bc073bd58167f7d4f0de082b534d8074c6a..f7e307b7876744a89c5776fca7bbcd796882c36f 100644 (file)
--- 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)
 
        # 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:
 
        # 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:
 
                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)
 
                                for s in scanner:
                                        s.handleFile(res, sfile)