improvements/fixes from MatN and Andrew related to AppImage and batch render

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / render.C

diff --git a/cinelerra-5.1/cinelerra/render.C b/cinelerra-5.1/cinelerra/render.C
index 741d6ff3747c0ef55dbbe5e5aeddf00584c09fe0..1136be9bb5415c475b0efcd58f11baaa9ad858e3 100644 (file)
--- a/cinelerra-5.1/cinelerra/render.C
+++ b/cinelerra-5.1/cinelerra/render.C
@@ -446,15 +446,16 @@ int Render::check_asset(EDL *edl, Asset &asset)
        return 0;
 }
 
-int Render::get_strategy(int use_renderfarm, int use_labels)
+int Render::get_strategy(int use_renderfarm, int use_labels, int range_type)
 {
-       return use_renderfarm ?
-               (use_labels ? FILE_PER_LABEL_FARM : SINGLE_PASS_FARM) :
-               (use_labels ? FILE_PER_LABEL      : SINGLE_PASS     ) ;
+       return range_type == RANGE_1FRAME ? SINGLE_PASS :
+                use_renderfarm ?
+                       (use_labels ? FILE_PER_LABEL_FARM : SINGLE_PASS_FARM) :
+                       (use_labels ? FILE_PER_LABEL      : SINGLE_PASS     ) ;
 }
 int Render::get_strategy()
 {
-       return get_strategy(preferences->use_renderfarm, use_labels);
+       return get_strategy(preferences->use_renderfarm, use_labels, range_type);
 }
 
 void Render::start_progress()
@@ -683,7 +684,7 @@ void RenderThread::render_single(int test_overwrite, Asset *asset, EDL *edl,
        render->result = 0;
 
 // Create rendering command
-       TransportCommand *command = new TransportCommand;
+       TransportCommand *command = new TransportCommand(render->preferences);
        command->command = NORMAL_FWD;
        command->get_edl()->copy_all(edl);
        command->change_type = CHANGE_ALL;
@@ -989,6 +990,8 @@ RenderWindow::RenderWindow(MWindow *mwindow,
        rangeselection = 0;
        rangeinout = 0;
        range1frame = 0;
+// *** CONTEXT_HELP ***
+       context_help_set_keyword("Single File Rendering");
 }
 
 RenderWindow::~RenderWindow()