X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Frender.C;h=702ffbd4028074d56362efbc0b87f7334efe6128;hb=9d832a1fff11b11aaa1108c460690ed05e2bdc05;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..702ffbd4 100644 --- a/cinelerra-5.1/cinelerra/render.C +++ b/cinelerra-5.1/cinelerra/render.C @@ -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, @@ -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 )