X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Fcwindow.C;h=3a65150df6c586664a0ce807ec5afd63c4edb3e0;hb=62709d0558a8c4366f75ae39f5f98e759e19fcfc;hp=7152f5a671206b40820044c6afe77d521063ca59;hpb=86bd203ac1fc29d93f63d13e2979468f06bdc3a2;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/cwindow.C b/cinelerra-5.1/cinelerra/cwindow.C index 7152f5a6..3a65150d 100644 --- a/cinelerra-5.1/cinelerra/cwindow.C +++ b/cinelerra-5.1/cinelerra/cwindow.C @@ -225,45 +225,28 @@ void CWindow::run() gui->run_window(); } -void CWindow::update(int position, - int overlays, - int tool_window, - int operation, - int timebar) +void CWindow::update(int dir, int overlays, int tool_window, int operation, int timebar) { - if(position) - { - refresh_frame(CHANGE_NONE); - } + if(dir) + refresh_frame(CHANGE_NONE, dir); gui->lock_window("CWindow::update 2"); - - // Create tool window if(operation) - { gui->set_operation(mwindow->edl->session->cwindow_operation); - } - // Updated by video device. - if(overlays && !position) - { + if(overlays && !dir) gui->canvas->draw_refresh(); - } // Update tool parameters // Never updated by someone else - if(tool_window || position) - { + if(tool_window || dir) gui->update_tool(); - } if(timebar) - { gui->timebar->update(1); - } double zoom = !mwindow->edl->session->cwindow_scrollbars ? 0 :mwindow->edl->session->cwindow_zoom; @@ -305,15 +288,15 @@ int CWindow::update_position(double position) return 1; } -void CWindow::refresh_frame(int change_type, EDL *edl) +void CWindow::refresh_frame(int change_type, EDL *edl, int dir) { - mwindow->refresh_mixers(); - playback_engine->refresh_frame(change_type, edl); + mwindow->refresh_mixers(dir); + playback_engine->refresh_frame(change_type, edl, dir); } -void CWindow::refresh_frame(int change_type) +void CWindow::refresh_frame(int change_type, int dir) { - refresh_frame(change_type, mwindow->edl); + refresh_frame(change_type, mwindow->edl, dir); } CWindowRemoteHandler::