X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Frender.C;h=03709b103a0bcbac8e30d4fcfba4a052368d45f8;hb=c9de74551f43dad1b898603c0827985773c0cf9d;hp=ded88a3f033f920d20c25ac85a1f0a0f24996839;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/render.C b/cinelerra-5.1/cinelerra/render.C
index ded88a3f..03709b10 100644
--- a/cinelerra-5.1/cinelerra/render.C
+++ b/cinelerra-5.1/cinelerra/render.C
@@ -82,7 +82,7 @@
 
 
 RenderItem::RenderItem(MWindow *mwindow)
- : BC_MenuItem(_("Render..."), _("Shift+R"), 'R')
+ : BC_MenuItem(_("Render..."), _("Shift-R"), 'R')
 {
 	this->mwindow = mwindow;
 	set_shift(1);
@@ -209,10 +209,9 @@ void MainPackageRenderer::set_progress(int64_t value)
 				eta,
 				TIME_HMS2);
 
-			printf(_("\r%d%% ETA: %s      "), (int)(100 *
-				(float)render->total_rendered /
-					render->progress_max),
-				string);
+			printf("\r%d%% %s: %s      ",
+				(int)(100 * (float)render->total_rendered / render->progress_max),
+				_("ETA"), string);
 			fflush(stdout);
 			render->last_eta = current_eta;
 		}
@@ -270,9 +269,7 @@ void Render::start_interactive()
 		mode = Render::INTERACTIVE;
 		BC_DialogThread::start();
 	}
-	else if( render_window && !in_progress )
-		render_window->raise_window();
-	else {
+	else if( in_progress ) {
 		ErrorBox error_box(_(PROGRAM_NAME ": Error"),
 			mwindow->gui->get_abs_cursor_x(1),
 			mwindow->gui->get_abs_cursor_y(1));
@@ -280,6 +277,9 @@ void Render::start_interactive()
 		error_box.raise_window();
 		error_box.run_window();
 	}
+	else if( render_window ) {
+		render_window->raise_window();
+	}
 }
 
 
@@ -289,22 +289,22 @@ void Render::start_batches(ArrayList<BatchRenderJob*> *jobs)
 	{
 		mode = Render::BATCH;
 		batch_cancelled = 0;
-		// raise the window if rendering hasn't started yet
-		if( render_window && ! in_progress ) {
-			render_window->raise_window();
-		}
-		else {
-			ErrorBox error_box(PROGRAM_NAME ": Error",
-					   mwindow->gui->get_abs_cursor_x(1),
-					   mwindow->gui->get_abs_cursor_y(1));
-			error_box.create_objects("Already rendering");
-			error_box.raise_window();
-			error_box.run_window();
-		}
 		this->jobs = jobs;
 		completion->reset();
 		start_render();
 	}
+	else if( in_progress ) {
+		ErrorBox error_box(_(PROGRAM_NAME ": Error"),
+				   mwindow->gui->get_abs_cursor_x(1),
+				   mwindow->gui->get_abs_cursor_y(1));
+		error_box.create_objects("Already rendering");
+		error_box.raise_window();
+		error_box.run_window();
+	}
+	// raise the window if rendering hasn't started yet
+	else if( render_window ) {
+		render_window->raise_window();
+	}
 }
 
 void Render::start_batches(ArrayList<BatchRenderJob*> *jobs,
@@ -350,6 +350,15 @@ BC_Window* Render::new_gui()
 	return render_window;
 }
 
+void Render::handle_done_event(int result)
+{
+	if(!result) {
+		// add to recentlist only on OK
+		render_window->format_tools->path_recent->
+			add_item(File::formattostr(asset->format), asset->path);
+	}
+	render_window = 0;
+}
 
 void Render::handle_close_event(int result)
 {
@@ -357,9 +366,6 @@ void Render::handle_close_event(int result)
 	const int debug = 0;
 
 	if(!result) {
-		// add to recentlist only on OK
-		render_window->format_tools->path_recent->
-			add_item(File::formattostr(asset->format), asset->path);
 // Check the asset format for errors.
 		FormatCheck format_check(asset);
 		format_error = format_check.check_format();
@@ -379,7 +385,6 @@ void Render::handle_close_event(int result)
 		if(debug) printf("Render::handle_close_event %d\n", __LINE__);
 	}
 //PRINT_TRACE
-	render_window = 0;
 }