projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Credit ffmpeg team - security fix for ffmpeg 5.1
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
batchrender.C
diff --git
a/cinelerra-5.1/cinelerra/batchrender.C
b/cinelerra-5.1/cinelerra/batchrender.C
index 9e4dbc3cdfe6ecf92eac4d69d80d318d524b04ac..20d817b5df222837f07ff18320cf28aa483b5449 100644
(file)
--- a/
cinelerra-5.1/cinelerra/batchrender.C
+++ b/
cinelerra-5.1/cinelerra/batchrender.C
@@
-542,7
+542,7
@@
void BatchRenderThread::calculate_dest_paths(ArrayList<char*> *paths,
PackageDispatcher *packages = new PackageDispatcher;
// Load EDL
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);
FileXML *file = new FileXML;
file->read_from_file(job->edl_path);
@@
-597,8
+597,10
@@
void BatchRenderThread::start_rendering(char *config_path,
else {
BC_Trace::disable_locks();
}
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_plugins(0, preferences);
+ MWindow::init_ladspa_plugins(0, preferences);
char font_path[BCTEXTLEN];
strcpy(font_path, preferences->plugin_dir);
strcat(font_path, "/" FONT_SEARCHPATH);
char font_path[BCTEXTLEN];
strcpy(font_path, preferences->plugin_dir);
strcat(font_path, "/" FONT_SEARCHPATH);
@@
-743,6
+745,8
@@
BatchRenderGUI::BatchRenderGUI(MWindow *mwindow,
this->mwindow = mwindow;
this->thread = thread;
use_renderfarm = 0;
this->mwindow = mwindow;
this->thread = thread;
use_renderfarm = 0;
+// *** CONTEXT_HELP ***
+ context_help_set_keyword("Batch Rendering");
}
BatchRenderGUI::~BatchRenderGUI()
}
BatchRenderGUI::~BatchRenderGUI()
@@
-1163,7
+1167,7
@@
void BatchRenderSaveList::run()
int BatchRenderSaveList::keypress_event() {
if( get_keypress() == 's' ||
get_keypress() == 'S' ) return handle_event();
int BatchRenderSaveList::keypress_event() {
if( get_keypress() == 's' ||
get_keypress() == 'S' ) return handle_event();
- return
0
;
+ return
context_help_check_and_show()
;
}
}
@@
-1244,7
+1248,7
@@
void BatchRenderLoadList::run()
int BatchRenderLoadList::keypress_event() {
if( get_keypress() == 'o' ||
get_keypress() == 'O' ) return handle_event();
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,
}
BatchRenderCurrentEDL::BatchRenderCurrentEDL(BatchRenderThread *thread,
@@
-1433,7
+1437,7
@@
int BatchRenderCancel::keypress_event()
thread->gui->set_done(1);
return 1;
}
thread->gui->set_done(1);
return 1;
}
- return
0
;
+ return
context_help_check_and_show()
;
}
//new help button
}
//new help button