X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fbatchrender.C;h=20d817b5df222837f07ff18320cf28aa483b5449;hb=HEAD;hp=6238d6d6808386c2aaf3edd04c2b488b363e4cb5;hpb=ddfda6a8cc59bda4dc734973c1c5fecaa31ea487;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/batchrender.C b/cinelerra-5.1/cinelerra/batchrender.C
index 6238d6d6..c010f185 100644
--- a/cinelerra-5.1/cinelerra/batchrender.C
+++ b/cinelerra-5.1/cinelerra/batchrender.C
@@ -2,6 +2,7 @@
 /*
  * CINELERRA
  * Copyright (C) 2011 Adam Williams <broadcast at earthling dot net>
+ * Copyright (C) 2003-2016 Cinelerra CV contributors
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -542,7 +543,7 @@ void BatchRenderThread::calculate_dest_paths(ArrayList<char*> *paths,
 			PackageDispatcher *packages = new PackageDispatcher;
 
 // Load EDL
-			TransportCommand *command = new TransportCommand;
+			TransportCommand *command = new TransportCommand(preferences);
 			FileXML *file = new FileXML;
 			file->read_from_file(job->edl_path);
 
@@ -597,8 +598,10 @@ void BatchRenderThread::start_rendering(char *config_path,
 	else {
 		BC_Trace::disable_locks();
 	}
-
+// In batch mode there is no mwindow, so init_plugins is called with
+// mwindow* = NULL.
 	MWindow::init_plugins(0, preferences);
+	MWindow::init_ladspa_plugins(0, preferences);  
 	char font_path[BCTEXTLEN];
 	strcpy(font_path, preferences->plugin_dir);
 	strcat(font_path, "/" FONT_SEARCHPATH);
@@ -743,6 +746,8 @@ BatchRenderGUI::BatchRenderGUI(MWindow *mwindow,
 	this->mwindow = mwindow;
 	this->thread = thread;
 	use_renderfarm = 0;
+// *** CONTEXT_HELP ***
+	context_help_set_keyword("Batch Rendering");
 }
 
 BatchRenderGUI::~BatchRenderGUI()
@@ -1163,7 +1168,7 @@ void BatchRenderSaveList::run()
 int BatchRenderSaveList::keypress_event() {
 	if( get_keypress() == 's' ||
 	    get_keypress() == 'S' ) return handle_event();
-	return 0;
+	return context_help_check_and_show();
 }
 
 
@@ -1244,7 +1249,7 @@ void BatchRenderLoadList::run()
 int BatchRenderLoadList::keypress_event() {
 	if( get_keypress() == 'o' ||
 	    get_keypress() == 'O' ) return handle_event();
-	return 0;
+	return context_help_check_and_show();
 }
 
 BatchRenderCurrentEDL::BatchRenderCurrentEDL(BatchRenderThread *thread,
@@ -1433,7 +1438,7 @@ int BatchRenderCancel::keypress_event()
 		thread->gui->set_done(1);
 		return 1;
 	}
-	return 0;
+	return context_help_check_and_show();
 }
 
 //new help button
@@ -1441,12 +1446,12 @@ BatchRenderHelp::BatchRenderHelp(BatchRenderThread *thread, int x, int y)
  : BC_GenericButton(x, y, _("?"))
 {
 	this->thread = thread;
-	set_tooltip(_("Open quick start guide"));
+	set_tooltip(_("Open quick start guide in default browser"));
 }
 
 int BatchRenderHelp::handle_event()
 {
-	system("$CIN_BROWSER file://$CIN_DAT/doc/help_br_index.html");
+	system("xdg-open file://$CIN_DAT/doc/help_br_index.html");
 	return 0;
 }