Changeset 10986

Timestamp:

04/09/08 22:54:54 (3 months ago)

Author:

duncan

Message:

[ 1993789 ] ogg is assumed to be audio
Added ogg to the extensions for mplayer

Location:

branches/rel-1/freevo

Files:

• freevo_config.py (modified) (4 diffs)
• local_conf.py.example (modified) (3 diffs)

branches/rel-1/freevo/freevo_config.py

@@ -1070 +1070 @@
 # are played wih MPlayer.
 #
-VIDEO_MPLAYER_SUFFIX = [ 'avi', 'mpg', 'mpeg', 'wmv', 'bin', 'rm',
-                         'divx', 'ogm', 'vob', 'asf', 'm2v', 'm2p',
-                         'mp4', 'viv', 'nuv', 'mov', 'iso',
-                         'nsv', 'mkv', 'ts', 'flv' ]
+VIDEO_MPLAYER_SUFFIX = [
+    'avi', 'mpg', 'mpeg', 'wmv', 'bin', 'rm', 'divx', 'ogm', 'vob', 'asf',
+    'm2v', 'm2p', 'mp4', 'viv', 'nuv', 'mov', 'iso', 'nsv', 'mkv', 'ogg',
+    'ts', 'flv',
+]
 
 #
@@ -1079 +1080 @@
 # are played wih Xine.
 #
-VIDEO_XINE_SUFFIX = [ 'avi', 'mpg', 'mpeg', 'rm', 'divx', 'ogm',
-                      'asf', 'm2v', 'm2p', 'mp4', 'mov', 'cue',
-                      'ts', 'iso', 'vob' ]
+VIDEO_XINE_SUFFIX = [
+    'avi', 'mpg', 'mpeg', 'rm', 'divx', 'ogm', 'asf', 'm2v', 'm2p', 'mp4',
+    'mov', 'cue', 'ts', 'iso', 'vob',
+]
 
 #
@@ -1138 +1140 @@
 # are played as audio.
 #
-AUDIO_SUFFIX = [ 'mp3', 'ogg', 'wav', 'm4a', 'wma', 'aac', 'flac', 'mka', 'ac3' ]
+AUDIO_SUFFIX = [
+    'mp3', 'ogg', 'wav', 'm4a', 'wma', 'aac', 'flac', 'mka', 'ac3',
+]
 
 #
@@ -2223 +2227 @@
 DEBUG_CHILDAPP = 0
 
+# Enable the timing of the event handler
 DEBUG_TIME = 0
+
+# Enable the benchmarking wrapper, when active prints the duration of a function call
+# We could be more specific and use a bit pattern to enable certain parts, like skins, tv, etc.
+DEBUG_BENCHMARKING = 0
 
 # The default logging level

branches/rel-1/freevo/local_conf.py.example

@@ -660 +660 @@
 # are played wih MPlayer.
 #
-# VIDEO_MPLAYER_SUFFIX = [ 'avi', 'mpg', 'mpeg', 'wmv', 'bin', 'rm',
-#                          'divx', 'ogm', 'vob', 'asf', 'm2v', 'm2p',
-#                          'mp4', 'viv', 'nuv', 'mov', 'iso',
-#                          'nsv', 'mkv' ]
+# VIDEO_MPLAYER_SUFFIX = [
+#     'avi', 'mpg', 'mpeg', 'wmv', 'bin', 'rm', 'divx', 'ogm', 'vob', 'asf',
+#     'm2v', 'm2p', 'mp4', 'viv', 'nuv', 'mov', 'iso', 'nsv', 'mkv', 'ogg',
+#     'ts', 'flv',
+# ]
 
 #
@@ -669 +670 @@
 # are played wih Xine.
 #
-# VIDEO_XINE_SUFFIX = [ 'avi', 'mpg', 'mpeg', 'rm', 'divx', 'ogm',
-#                       'asf', 'm2v', 'm2p', 'mp4', 'mov', 'cue' ]
+# VIDEO_XINE_SUFFIX = [
+#     'avi', 'mpg', 'mpeg', 'rm', 'divx', 'ogm', 'asf', 'm2v', 'm2p', 'mp4',
+#     'mov', 'cue', 'ts', 'iso', 'vob',
+# ]
 
 #
@@ -734 +737 @@
 # are played as audio.
 #
-# AUDIO_SUFFIX = [ 'mp3', 'ogg', 'wav','m4a', 'wma', 'aac', 'flac', 'mka' ]
+# AUDIO_SUFFIX = [
+#     'mp3', 'ogg', 'wav', 'm4a', 'wma', 'aac', 'flac', 'mka', 'ac3',
+# ]
 
 #