X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Frender.C;h=d6db3811469629a999d44d1889e91b66d1475673;hb=72a6abf751403bd91464e77ff2cece01c9756a6b;hp=21e33c20f5cdcdcc33e159959d060af007e2f97c;hpb=190b4810ec184c74ceab3fcd6faf09a91c92c53c;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/render.C b/cinelerra-5.1/cinelerra/render.C
index 21e33c20..d6db3811 100644
--- a/cinelerra-5.1/cinelerra/render.C
+++ b/cinelerra-5.1/cinelerra/render.C
@@ -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;
 		}
@@ -295,7 +294,7 @@ void Render::start_batches(ArrayList<BatchRenderJob*> *jobs)
 		start_render();
 	}
 	else if( in_progress ) {
-		ErrorBox error_box(PROGRAM_NAME ": Error",
+		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");
@@ -331,20 +330,16 @@ BC_Window* Render::new_gui()
 	batch_cancelled = 0;
 	format_error = 0;
 	result = 0;
-	completion->reset();
 
 	if(mode == Render::INTERACTIVE) {
 // Fix the asset for rendering
 		if(!asset) asset = new Asset;
 		load_defaults(asset);
 		check_asset(mwindow->edl, *asset);
-
+		int px = mwindow->gui->get_pop_cursor_x(1);
+		int py = mwindow->gui->get_pop_cursor_y(1);
 // Get format from user
-		render_window = new RenderWindow(mwindow,
-			this,
-			asset,
-			mwindow->gui->get_abs_cursor_x(1),
-			mwindow->gui->get_abs_cursor_y(1));
+		render_window = new RenderWindow(mwindow, this, asset, px, py);
 		render_window->create_objects();
 	}
 
@@ -530,6 +525,7 @@ void Render::start_render()
 	in_progress = 0;
 	elapsed_time = 0.0;
 	result = 0;
+	completion->reset();
 	thread->start();
 }
 
@@ -1012,7 +1008,6 @@ if(debug) printf("Render::render %d\n", __LINE__);
 
 	render->packages = 0;
 	render->in_progress = 0;
-	render->completion->unlock();
 if(debug) printf("Render::render %d\n", __LINE__);
 }
 
@@ -1097,6 +1092,7 @@ void RenderThread::run()
 			mwindow->batch_render->update_done(-1, 0, 0);
 		}
 	}
+	render->completion->unlock();
 }
 
 
@@ -1109,10 +1105,8 @@ RenderWindow::RenderWindow(MWindow *mwindow,
 	Asset *asset,
 	int x,
 	int y)
- : BC_Window(_(PROGRAM_NAME ": Render"),
- 	x - WIDTH / 2, y - HEIGHT / 2,
- 	WIDTH, HEIGHT, WIDTH, HEIGHT,
-	0, 0, 1)
+ : BC_Window(_(PROGRAM_NAME ": Render"), x, y,
+ 	WIDTH, HEIGHT, WIDTH, HEIGHT, 0, 0, 1)
 {
 	this->mwindow = mwindow;
 	this->render = render;