diff options
Diffstat (limited to 'release/scripts/startup/bl_operators/screen_play_rendered_anim.py')
-rw-r--r-- | release/scripts/startup/bl_operators/screen_play_rendered_anim.py | 40 |
1 files changed, 13 insertions, 27 deletions
diff --git a/release/scripts/startup/bl_operators/screen_play_rendered_anim.py b/release/scripts/startup/bl_operators/screen_play_rendered_anim.py index 3900fc3f2c2..6c29c07c62e 100644 --- a/release/scripts/startup/bl_operators/screen_play_rendered_anim.py +++ b/release/scripts/startup/bl_operators/screen_play_rendered_anim.py @@ -32,25 +32,11 @@ def guess_player_path(preset): if preset == 'INTERNAL': return bpy.app.binary_path - elif preset == 'BLENDER24': - player_path = "blender" - - if sys.platform == "darwin": - test_path = "/Applications/blender 2.49.app/Contents/MacOS/blender" - elif sys.platform[:3] == "win": - test_path = "/Program Files/Blender Foundation/Blender/blender.exe" - - if os.path.exists(test_path): - player_path = test_path elif preset == 'DJV': - player_path = "djv_view" - + player_path = "djv" if sys.platform == "darwin": - # TODO, crummy supporting only 1 version, - # could find the newest installed version - test_path = ("/Applications/djv-0.8.2.app" - "/Contents/Resources/bin/djv_view") + test_path = "/Applications/DJV2.app/Contents/Resources/bin/djv" if os.path.exists(test_path): player_path = test_path @@ -148,13 +134,19 @@ class PlayRenderedAnim(Operator): ] cmd.extend(opts) elif preset == 'DJV': - opts = [file, "-playback_speed", str(int(fps_final))] + opts = [ + file, + "-speed", str(fps_final), + "-in_out", str(frame_start), str(frame_end), + "-frame", str(scene.frame_current), + "-time_units", "Frames" + ] cmd.extend(opts) elif preset == 'FRAMECYCLER': - opts = [file, f"{scene.frame_start:d}-{scene.frame_end:d}"] + opts = [file, "%d-%d" % (scene.frame_start, scene.frame_end)] cmd.extend(opts) elif preset == 'RV': - opts = ["-fps", str(rd.fps), "-play", f"[ {file:s} ]"] + opts = ["-fps", str(rd.fps), "-play", "[ %s ]" % file] cmd.extend(opts) elif preset == 'MPLAYER': opts = [] @@ -164,7 +156,7 @@ class PlayRenderedAnim(Operator): opts += [ ("mf://" + file.replace("#", "?")), "-mf", - f"fps={fps_final:4f}" + "fps=%.4f" % fps_final, ] opts += ["-loop", "0", "-really-quiet", "-fs"] @@ -175,14 +167,8 @@ class PlayRenderedAnim(Operator): # launch it print("Executing command:\n ", " ".join(quote(c) for c in cmd)) - # workaround for boost 1.46, can be eventually removed. bug: [#32350] - env_copy = os.environ.copy() - if preset == 'INTERNAL': - env_copy["LC_ALL"] = "C" - # end workaround - try: - subprocess.Popen(cmd, env=env_copy) + subprocess.Popen(cmd) except Exception as e: err_msg = tip_("Couldn't run external animation player with command %r\n%s") % (cmd, e) self.report( |