[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25355] trunk/blender/release/scripts/op/ screen_play_rendered_anim.py: Fix for playing back movie files

[Matt Ebb]

Revision: 25355
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25355
Author:   broken
Date:     2009-12-14 05:03:18 +0100 (Mon, 14 Dec 2009)

Log Message:
-----------
Fix for playing back movie files

Modified Paths:
--------------
    trunk/blender/release/scripts/op/screen_play_rendered_anim.py

Modified: trunk/blender/release/scripts/op/screen_play_rendered_anim.py
===================================================================
--- trunk/blender/release/scripts/op/screen_play_rendered_anim.py	2009-12-14 03:48:23 UTC (rev 25354)
+++ trunk/blender/release/scripts/op/screen_play_rendered_anim.py	2009-12-14 04:03:18 UTC (rev 25355)
@@ -50,6 +50,15 @@
     'THEORA':'ogg',
     }
 
+movie_formats = ('QUICKTIME_QTKIT', 
+                'QUICKTIME_CARBONTKIT', 
+                'AVIRAW',
+                'AVIJPEG',
+                'AVICODEC',
+                'XVID',
+                'THEORA'
+                )
+
 def guess_player_path(preset):
     if preset == 'BLENDER24':
         player_path = 'blender'
@@ -91,16 +100,19 @@
         
         preset = prefs.filepaths.animation_player_preset
         player_path = prefs.filepaths.animation_player
+        file_path = bpy.utils.expandpath(rd.output_path)
         
         # try and guess a command line if it doesn't exist
         if player_path == '':
             player_path = guess_player_path(preset)
         
         # doesn't support ### frame notation yet
-        if preset in ('BLENDER24', 'DJV', 'CUSTOM'):
-            file = "%s%04d" % (bpy.utils.expandpath(rd.output_path), sce.start_frame)
+        if rd.file_format in movie_formats:
+            file = "%s%04d_%04d" % (file_path, sce.start_frame, sce.end_frame)
+        elif preset in ('BLENDER24', 'DJV', 'CUSTOM'):
+            file = "%s%04d" % (file_path, sce.start_frame)
         elif preset in ('FRAMECYCLER', 'RV'):
-            file = "%s#" % bpy.utils.expandpath(rd.output_path)
+            file = "%s#" % file_path
         
         if rd.file_extensions:
             file += '.' + img_format_exts[rd.file_format]