add ForceDirectPlay, ForceTranscoding to Settings

cuskinfor · Apr 27, 2013 · f2b1ef1 · f2b1ef1
1 parent 51d261a
commit f2b1ef1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/Settings.py b/Settings.py
@@ -15,4 +15,11 @@ def getIP_aTV():
     return '192.168.178.22'  # todo: how about more than one aTV?
 
 def getIP_DNSmaster():  # Router, ISP's DNS, ...
-    return '192.168.178.1'
+    return '192.168.178.1'
+
+# AppleTV capabilities
+def getForceDirectPlay():  # if true, this has higher priority than transcoding
+    return True
+
+def getForceTranscoding():
+    return False
diff --git a/XMLConverter.py b/XMLConverter.py
@@ -268,7 +268,9 @@ def XML_processMEDIAPATH(params, src):
 
     # check "Media' element and get key
     if el!=None:
-        if el.get('container','') in ("mov", "mp4") and \
+        if Settings.getForceDirectPlay()==True or \
+           Settings.getForceTranscoding()==False and \
+           el.get('container','') in ("mov", "mp4") and \
            el.get('videoCodec','') in ("mpeg4", "h264") and \
            el.get('audioCodec','') in ("aac", "ac3"):
             # native aTV media