add autoplay detection for .ts movies

diff --git a/lib/python/Components/Scanner.py b/lib/python/Components/Scanner.py
index 6bd0e3bddc4b970c21ff7f8912580522439a8897..69237bc073bd58167f7d4f0de082b534d8074c6a 100644 (file)
--- a/lib/python/Components/Scanner.py
+++ b/lib/python/Components/Scanner.py
@@ -26,8 +26,10 @@ def getType(file):
                        return "application/ogg"
                elif ext == "dmpkg":
                        return "application/x-dream-package"
+               elif ext == "ts":
+                       return "video/MP2T"
                elif ext == "iso":
-                       return "video/x-dvd-iso"        
+                       return "video/x-dvd-iso"
                elif file[-12:].lower() == "video_ts.ifo":
                        return "video/x-dvd"
        return type

diff --git a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
index cb20dd222a91025ba66b118fafd4eeab2f0d8832..e1e0e2269e57f6683594cebda4cbc0611f918b66 100644 (file)
--- a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
@@ -784,7 +784,11 @@ def filescan_open(list, session, **kwargs):
 
        mp.switchToPlayList()
        for file in list:
-               ref = eServiceReference(4097, 0, file.path)
+               if file.mimetype == "video/MP2T":
+                       stype = 1
+               else:
+                       stype = 4097
+               ref = eServiceReference(stype, 0, file.path)
                mp.playlist.addFile(ref)
 
        # TODO: rather play first than last file?
@@ -812,7 +816,7 @@ def audioCD_open(list, session, **kwargs):
 def filescan(**kwargs):
        from Components.Scanner import Scanner, ScanPath
        mediatypes = [
-               Scanner(mimetypes = ["video/mpeg"],
+               Scanner(mimetypes = ["video/mpeg", "video/MP2T"],
                        paths_to_scan =
                                [
                                        ScanPath(path = "", with_subdirs = False),