Changeset 866

Timestamp:

06/06/07 08:26:57 (2 years ago)

Author:

lilo_booter

Message:

+ Allows command line overrides of video/audio stores in preview

Location:

trunk/jahtools/jbatch

Files:

• common.py (modified) (2 diffs)
• jbatch.py (modified) (5 diffs)

trunk/jahtools/jbatch/common.py

@@ -74 +74 @@
 
 class preview:
+        video_choice = "sdl_video:"
+        audio_choice = "sdl_audio:"
         video_store = None
         audio_store = None
@@ -94 +96 @@
                                         NSApplicationLoad()
 
-                                preview.video_store = openmedialib.create_store( "sdl:", frame )
+                                preview.video_store = openmedialib.create_store( preview.video_choice, frame )
                                 if preview.video_store is None:
                                         preview.video_store = openmedialib.create_store( "glew:", frame )
                                 else:
-                                        preview.audio_store = openmedialib.create_store( "sdl_audio:", frame )
+                                        preview.audio_store = openmedialib.create_store( preview.audio_choice, frame )
                                 for k in preview.sdl.keys( ):
                                         assign_prop( preview.video_store.properties( ).get_property( k ), [ k, preview.sdl[ k ] ] )
                         else:
-                                preview.audio_store = openmedialib.create_store( "sdl_audio:", frame )
+                                preview.audio_store = openmedialib.create_store( preview.audio_choice, frame )
 
                         if preview.audio_store is not None:

trunk/jahtools/jbatch/jbatch.py

@@ -9 +9 @@
 import keygrab
 import platform
+import common
 
 def usage( ):
@@ -17 +18 @@
 
     -n, --no-key-grab : disable terminal io functionality
+    -v, --video=store : specify video store (default: sdl_video:)
+    -a, --audio=store : specify audio store (default: sdl_audio:)
 
 Special:
@@ -51 +54 @@
         ops = [ ]
         key_grab = True
+        key = None
 
         for i in sys.argv[ 1: ]:
@@ -60 +64 @@
                 if i in ( "-n", "--no-key-grab" ):
                         key_grab = False
+                elif i in ( "-v", "--video" ):
+                        key = "video"
+                elif i in ( "-v", "--audio" ):
+                        key = "audio"
                 elif i in [ "--help" ]:
                         usage( )
@@ -66 +74 @@
                         arg = i
 
-                if arg is not None:
+                if arg is not None and key is None:
                         ops.append( arg )
+                elif arg is not None and key == "video":
+                        common.preview.video_choice = arg
+                        key = None
+                elif arg is not None and key == "audio":
+                        common.preview.audio_choice = arg
+                        key = None
 
         if len( ops ) > 0: