X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.C;h=8c0dd6c0049d1317bbe0aba96587e53d617589dd;hb=82931d63c508e5953e9d5a19be76b60ec0e146c5;hp=93e0a457aba68912903ef05b7d5fe21e10700cc1;hpb=2fba7eab40198b35d9edb20c16bcc1b8c262f7a2;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C index 93e0a457..8c0dd6c0 100644 --- a/cinelerra-5.1/cinelerra/mwindow.C +++ b/cinelerra-5.1/cinelerra/mwindow.C @@ -3081,7 +3081,6 @@ void MWindow::set_auto_keyframes(int value) gui->mbuttons->edit_panel->keyframe->update(value); gui->flush(); cwindow->gui->lock_window("MWindow::set_auto_keyframes"); - cwindow->gui->edit_panel->keyframe->update(value); cwindow->gui->flush(); cwindow->gui->unlock_window(); } @@ -3092,7 +3091,6 @@ void MWindow::set_span_keyframes(int value) gui->mbuttons->edit_panel->span_keyframe->update(value); gui->flush(); cwindow->gui->lock_window("MWindow::set_span_keyframes"); - cwindow->gui->edit_panel->span_keyframe->update(value); cwindow->gui->flush(); cwindow->gui->unlock_window(); } @@ -5085,13 +5083,17 @@ PatchGUI *MWindow::get_patchgui(Track *track) return patchgui; } -int MWindow::get_cpus() +int MWindow::get_cpus(int out_w, int out_h) { - int out_w = edl->session->output_w; - int out_h = edl->session->output_h; + if( !out_w ) out_w = edl->session->output_w; + if( !out_h ) out_h = edl->session->output_h; int cpus = out_w*out_h/0x80000 + 1; if( cpus > preferences->processors ) cpus = preferences->processors; return cpus; } +int MWindow::get_cpus() +{ + return get_cpus(edl->session->output_w, edl->session->output_h); +}