X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fvwindowgui.C;h=814161b67854d1286a0d72aafa4612228c6697fd;hp=985d484bdf4fa224f8abba96d0da7308b7d691bb;hb=61298e645e43da02c939e9512949f0b183542d58;hpb=0c7b0aebb5e9f85f4eb7abb69b800d8d37b30b0f diff --git a/cinelerra-5.1/cinelerra/vwindowgui.C b/cinelerra-5.1/cinelerra/vwindowgui.C index 985d484b..814161b6 100644 --- a/cinelerra-5.1/cinelerra/vwindowgui.C +++ b/cinelerra-5.1/cinelerra/vwindowgui.C @@ -489,7 +489,7 @@ void VWindowGUI::stop_transport() { if( !transport->is_stopped() ) { unlock_window(); - transport->handle_transport(STOP, 1, 0, 0); + transport->handle_transport(STOP, 1); lock_window("VWindowGUI::panel_stop_transport"); } } @@ -590,7 +590,7 @@ void VWindowEditing::set_position(double position) if( position < 0 ) position = 0; edl->local_session->set_selectionstart(position); edl->local_session->set_selectionend(position); - vwindow->update_position(CHANGE_NONE, 0, 1); + vwindow->update_position(); } } @@ -620,9 +620,7 @@ void VWindowEditing::panel_toggle_label() void VWindowEditing::panel_next_label(int cut) { if( !vwindow->get_edl() ) return; - vwindow->gui->unlock_window(); - vwindow->playback_engine->interrupt_playback(1); - vwindow->gui->lock_window("VWindowEditing::next_label"); + vwindow->interrupt_playback(1); EDL *edl = vwindow->get_edl(); Label *current = edl->labels->next_label( @@ -631,16 +629,14 @@ void VWindowEditing::panel_next_label(int cut) edl->tracks->total_length(); edl->local_session->set_selectionstart(position); edl->local_session->set_selectionend(position); - vwindow->update_position(CHANGE_NONE, 0, 1, 0); + vwindow->update_position(); vwindow->gui->timebar->update(1); } void VWindowEditing::panel_prev_label(int cut) { if( !vwindow->get_edl() ) return; - vwindow->gui->unlock_window(); - vwindow->playback_engine->interrupt_playback(1); - vwindow->gui->lock_window("VWindowEditing::prev_label"); + vwindow->interrupt_playback(1); EDL *edl = vwindow->get_edl(); Label *current = edl->labels->prev_label( @@ -648,7 +644,7 @@ void VWindowEditing::panel_prev_label(int cut) double position = !current ? 0 : current->position; edl->local_session->set_selectionstart(position); edl->local_session->set_selectionend(position); - vwindow->update_position(CHANGE_NONE, 0, 1, 0); + vwindow->update_position(); vwindow->gui->timebar->update(1); } @@ -818,9 +814,7 @@ void VWindowCanvas::zoom_resize_window(float percentage) void VWindowCanvas::close_source() { - gui->unlock_window(); - gui->vwindow->playback_engine->interrupt_playback(1); - gui->lock_window("VWindowCanvas::close_source"); + gui->vwindow->interrupt_playback(1); gui->vwindow->delete_source(1, 1); }