X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Frender.C;h=5ce0354170f9edfb2ad7fb301a853f4c79efaea4;hb=4ed99d3ff21fc5809ff2a2927f6d99413f80a168;hp=6667cbbba30d1e6241fe2a6000d330285618c7e3;hpb=e5d1c3ec8b49e9e4cd31f30e991f52ab11de93b1;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/render.C b/cinelerra-5.1/cinelerra/render.C
index 6667cbbb..5ce03541 100644
--- a/cinelerra-5.1/cinelerra/render.C
+++ b/cinelerra-5.1/cinelerra/render.C
@@ -271,7 +271,7 @@ void Render::start_interactive()
 	}
 	else if( in_progress ) {
 		int cx, cy;
-		mwindow->gui->get_abs_cursor_xy(cx, cy, 1);
+		mwindow->gui->get_abs_cursor(cx, cy, 1);
 		ErrorBox error_box(_(PROGRAM_NAME ": Error"), cx, cy);
 		error_box.create_objects(_("Already rendering"));
 		error_box.raise_window();
@@ -295,7 +295,7 @@ void Render::start_batches(ArrayList<BatchRenderJob*> *jobs)
 	}
 	else if( in_progress ) {
 		int cx, cy;
-		mwindow->gui->get_abs_cursor_xy(cx, cy, 1);
+		mwindow->gui->get_abs_cursor(cx, cy, 1);
 		ErrorBox error_box(_(PROGRAM_NAME ": Error"), cx, cy);
 		error_box.create_objects("Already rendering");
 		error_box.raise_window();
@@ -394,7 +394,7 @@ void Render::handle_close_event(int result)
 	}
 	if( err_msg ) {
 		int cx, cy;
-		mwindow->gui->get_abs_cursor_xy(cx, cy, 1);
+		mwindow->gui->get_abs_cursor(cx, cy, 1);
 		ErrorBox error_box(_(PROGRAM_NAME ": Error"),cx, cy);
 		error_box.create_objects(err_msg);
 		error_box.raise_window();
@@ -930,7 +930,7 @@ if(debug) printf("Render::render %d\n", __LINE__);
 			{
 if(debug) printf("Render::render %d\n", __LINE__);
 				int cx, cy;
-				mwindow->gui->get_abs_cursor_xy(cx, cy, 1);
+				mwindow->gui->get_abs_cursor(cx, cy, 1);
 				ErrorBox error_box(_(PROGRAM_NAME ": Error"), cx, cy);
 				error_box.create_objects(_("Error rendering data."));
 				error_box.raise_window();
@@ -1121,7 +1121,7 @@ void RenderThread::run()
 
 
 #define WIDTH 480
-#define HEIGHT 455
+#define HEIGHT 480
 
 
 RenderWindow::RenderWindow(MWindow *mwindow,
@@ -1185,16 +1185,18 @@ void RenderWindow::create_objects()
 	if( is_image )
 		render->range_type = RANGE_1FRAME;
 
-	int x1 = x + title->get_w() + 20, x2 = x1 + 140;
+	int x1 = x + title->get_w() + 20;
 	add_subwindow(rangeproject = new RenderRangeProject(this,
 		render->range_type == RANGE_PROJECT, x1, y));
-	add_subwindow(range1frame = new RenderRange1Frame(this,
-		render->range_type == RANGE_1FRAME, x2, y));
 	y += 20;
 	add_subwindow(rangeselection = new RenderRangeSelection(this,
 		render->range_type == RANGE_SELECTION, x1, y));
+	y += 20;
 	add_subwindow(rangeinout = new RenderRangeInOut(this,
-		render->range_type == RANGE_INOUT, x2, y));
+		render->range_type == RANGE_INOUT, x1, y));
+	y += 20;
+	add_subwindow(range1frame = new RenderRange1Frame(this,
+		render->range_type == RANGE_1FRAME, x1, y));
 	y += 30;
 
 	if( is_image )