External Player: update DJV to version 2
This commit is contained in:
parent
c877c3b8f6
commit
961fa2251e
@ -34,13 +34,9 @@ def guess_player_path(preset):
|
|||||||
return bpy.app.binary_path
|
return bpy.app.binary_path
|
||||||
|
|
||||||
elif preset == 'DJV':
|
elif preset == 'DJV':
|
||||||
player_path = "djv_view"
|
player_path = "djv"
|
||||||
|
|
||||||
if sys.platform == "darwin":
|
if sys.platform == "darwin":
|
||||||
# TODO, crummy supporting only 1 version,
|
test_path = "/Applications/DJV2.app/Contents/Resources/bin/djv"
|
||||||
# could find the newest installed version
|
|
||||||
test_path = ("/Applications/djv-0.8.2.app"
|
|
||||||
"/Contents/Resources/bin/djv_view")
|
|
||||||
if os.path.exists(test_path):
|
if os.path.exists(test_path):
|
||||||
player_path = test_path
|
player_path = test_path
|
||||||
|
|
||||||
@ -138,7 +134,13 @@ class PlayRenderedAnim(Operator):
|
|||||||
]
|
]
|
||||||
cmd.extend(opts)
|
cmd.extend(opts)
|
||||||
elif preset == 'DJV':
|
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)
|
cmd.extend(opts)
|
||||||
elif preset == 'FRAMECYCLER':
|
elif preset == 'FRAMECYCLER':
|
||||||
opts = [file, f"{scene.frame_start:d}-{scene.frame_end:d}"]
|
opts = [file, f"{scene.frame_start:d}-{scene.frame_end:d}"]
|
||||||
|
@ -5887,9 +5887,9 @@ static void rna_def_userdef_filepaths(BlenderRNA *brna)
|
|||||||
|
|
||||||
static const EnumPropertyItem anim_player_presets[] = {
|
static const EnumPropertyItem anim_player_presets[] = {
|
||||||
{0, "INTERNAL", 0, "Internal", "Built-in animation player"},
|
{0, "INTERNAL", 0, "Internal", "Built-in animation player"},
|
||||||
{2, "DJV", 0, "Djv", "Open source frame player: http://djv.sourceforge.net"},
|
{2, "DJV", 0, "DJV", "Open source frame player: http://djv.sourceforge.net"},
|
||||||
{3, "FRAMECYCLER", 0, "FrameCycler", "Frame player from IRIDAS"},
|
{3, "FRAMECYCLER", 0, "FrameCycler", "Frame player from IRIDAS"},
|
||||||
{4, "RV", 0, "rv", "Frame player from Tweak Software"},
|
{4, "RV", 0, "RV", "Frame player from Tweak Software"},
|
||||||
{5, "MPLAYER", 0, "MPlayer", "Media player for video & png/jpeg/sgi image sequences"},
|
{5, "MPLAYER", 0, "MPlayer", "Media player for video & png/jpeg/sgi image sequences"},
|
||||||
{50, "CUSTOM", 0, "Custom", "Custom animation player executable path"},
|
{50, "CUSTOM", 0, "Custom", "Custom animation player executable path"},
|
||||||
{0, NULL, 0, NULL, NULL},
|
{0, NULL, 0, NULL, NULL},
|
||||||
|
Loading…
Reference in New Issue
Block a user