X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fbatchrender.C;h=4f685c285357de71bc0224ca23989c52080362b8;hp=8a1bc56f3f267ad3f93808b69392b4f3e1f16d97;hb=7e5a0760f40ff787cc3d93cb7768a901ebe52809;hpb=047485402c380ee034045712121c649ddf89eda4

diff --git a/cinelerra-5.1/cinelerra/batchrender.C b/cinelerra-5.1/cinelerra/batchrender.C
index 8a1bc56f..4f685c28 100644
--- a/cinelerra-5.1/cinelerra/batchrender.C
+++ b/cinelerra-5.1/cinelerra/batchrender.C
@@ -58,7 +58,7 @@
 // Farmed is not present if not preferences->use_renderfarm
 int BatchRenderThread::column_widths[] = { 42, 42, 42, 222, 222, 150 };
 const char *BatchRenderThread::column_titles[] = {
-	_("Enabled"), _("Labeled"), _("Farmed"), _("Output"), _("EDL"), _("Elapsed")
+	N_("Enabled"), N_("Labeled"), N_("Farmed"), N_("Output"), N_("EDL"), N_("Elapsed")
 };
 
 BatchRenderMenuItem::BatchRenderMenuItem(MWindow *mwindow)
@@ -357,7 +357,7 @@ void BatchRenderThread::update_selected_edl()
         FileXML xml_file;
 	char *path = get_current_edl();
 	EDL *edl = mwindow->edl;
-        edl->save_xml(&xml_file, path, 0, 0);
+        edl->save_xml(&xml_file, path);
         xml_file.terminate_string();
         if( xml_file.write_to_file(path) ) {
 		char msg[BCTEXTLEN];
@@ -672,6 +672,8 @@ BatchRenderGUI::BatchRenderGUI(MWindow *mwindow,
 BatchRenderGUI::~BatchRenderGUI()
 {
 	lock_window("BatchRenderGUI::~BatchRenderGUI");
+	loadlist_batch->stop();
+	savelist_batch->stop();
 	delete format_tools;
 	unlock_window();
 }
@@ -857,19 +859,19 @@ void BatchRenderGUI::create_list(int update_widget)
 
 	const char **column_titles = BatchRenderThread::column_titles;
 	list_columns = 0;
-	list_titles[list_columns] = column_titles[ENABLED_COL];
+	list_titles[list_columns] = _(column_titles[ENABLED_COL]);
 	list_width[list_columns++] = thread->list_width[ENABLED_COL];
-	list_titles[list_columns] = column_titles[LABELED_COL];
+	list_titles[list_columns] = _(column_titles[LABELED_COL]);
 	list_width[list_columns++] = thread->list_width[LABELED_COL];
 	if( mwindow->preferences->use_renderfarm ) {
-		list_titles[list_columns] = column_titles[FARMED_COL];
+		list_titles[list_columns] = _(column_titles[FARMED_COL]);
 		list_width[list_columns++] = thread->list_width[FARMED_COL];
 	}
-	list_titles[list_columns] = column_titles[OUTPUT_COL];
+	list_titles[list_columns] = _(column_titles[OUTPUT_COL]);
 	list_width[list_columns++] = thread->list_width[OUTPUT_COL];
-	list_titles[list_columns] = column_titles[EDL_COL];
+	list_titles[list_columns] = _(column_titles[EDL_COL]);
 	list_width[list_columns++] = thread->list_width[EDL_COL];
-	list_titles[list_columns] = column_titles[ELAPSED_COL];
+	list_titles[list_columns] = _(column_titles[ELAPSED_COL]);
 	list_width[list_columns++] = thread->list_width[ELAPSED_COL];
 
 	for( int i = 0; i < thread->jobs.total; i++ ) {
@@ -996,16 +998,17 @@ BatchRenderSaveList::BatchRenderSaveList(BatchRenderThread *thread, int x, int y
 }
 
 BatchRenderSaveList::~BatchRenderSaveList()
+{
+	stop();
+	delete startup_lock;
+}
+
+void BatchRenderSaveList::stop()
 {
 	startup_lock->lock("BatchRenderSaveList::~BrowseButton");
-	if( gui ) {
-		gui->lock_window();
-		gui->set_done(1);
-		gui->unlock_window();
-	}
+	if( gui ) gui->set_done(1);
 	startup_lock->unlock();
 	Thread::join();
-	delete startup_lock;
 }
 
 int BatchRenderSaveList::handle_event()
@@ -1046,7 +1049,6 @@ void BatchRenderSaveList::run()
 		thread->save_jobs(thread->batch_path);
 	}
 
-	this->thread->gui->flush();
 	startup_lock->lock("BatchRenderLoadList::run");
 	gui = 0;
 	startup_lock->unlock();
@@ -1072,16 +1074,17 @@ BatchRenderLoadList::BatchRenderLoadList(BatchRenderThread *thread,
 }
 
 BatchRenderLoadList::~BatchRenderLoadList()
+{
+	stop();
+	delete startup_lock;
+}
+
+void BatchRenderLoadList::stop()
 {
 	startup_lock->lock("BatchRenderLoadList::~BrowseButton");
-	if( gui ) {
-		gui->lock_window();
-		gui->set_done(1);
-		gui->unlock_window();
-	}
+	if( gui ) gui->set_done(1);
 	startup_lock->unlock();
 	Thread::join();
-	delete startup_lock;
 }
 
 int BatchRenderLoadList::handle_event()
@@ -1125,7 +1128,6 @@ void BatchRenderLoadList::run()
 		thread->gui->change_job();
 	}
 
-	thread->gui->flush();
 	startup_lock->lock("BatchRenderLoadList::run");
 	gui = 0;
 	startup_lock->unlock();
@@ -1240,6 +1242,7 @@ int BatchRenderList::drag_stop_event()
 			thread->move_batch(src, dst);
 		}
 		BC_ListBox::drag_stop_event();
+		dragging_item = 0;
 	}
 	return 0;
 }