X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Frender.C;h=433876bbdad6afd6871b18a5f28212c546316ee9;hb=6338f0b010dfd93ae6a823970d853cfdd5279500;hp=085384ae9b8ad3f2b165062f349897ff53acb7b3;hpb=d66e2dde00fcfbe27c461a9956e66753faa62c95;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/render.C b/cinelerra-5.1/cinelerra/render.C index 085384ae..433876bb 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 *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(); @@ -970,7 +970,7 @@ if(debug) printf("Render::render %d\n", __LINE__); ArrayList *assets = render->packages->get_asset_list(); if(debug) printf("Render::render %d\n", __LINE__); if(render->load_mode == LOADMODE_PASTE) - mwindow->clear(0); + mwindow->clear(0, 1); if(debug) printf("Render::render %d\n", __LINE__); mwindow->load_assets(assets, -1, render->load_mode, 0, 0, mwindow->edl->session->labels_follow_edits,