X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fvwindow.C;h=8de4eb73170154add8af0a090bb621e81107e84c;hp=2f96447c4674981ebbc5d21438b8fd322e9f267e;hb=243336668c89096732786c6b3f3c5918aa2eff26;hpb=4b6c39e6cf4a3fd9c1b347db6de686ab55d6cac8 diff --git a/cinelerra-5.1/cinelerra/vwindow.C b/cinelerra-5.1/cinelerra/vwindow.C index 2f96447c..8de4eb73 100644 --- a/cinelerra-5.1/cinelerra/vwindow.C +++ b/cinelerra-5.1/cinelerra/vwindow.C @@ -328,10 +328,7 @@ void VWindow::update_position(int change_type, { //printf("VWindow::update_position %d\n", __LINE__); //edl->dump(); - playback_engine->que->send_command(CURRENT_FRAME, - change_type, - edl, - 1); + playback_engine->refresh_frame(change_type, edl); double position = edl->local_session->get_selectionstart(1); if(lock_window) gui->lock_window("VWindow::update_position"); @@ -340,9 +337,10 @@ void VWindow::update_position(int change_type, } } - - - +void VWindow::stop_playback(int wait) +{ + playback_engine->stop_playback(wait); +} int VWindow::update_position(double position) { @@ -386,22 +384,12 @@ void VWindow::set_outpoint() } } -void VWindow::clear_inpoint() -{ - EDL *edl = get_edl(); - if(edl) - { - edl->local_session->unset_inpoint(); - gui->timebar->update(1); - } -} - -void VWindow::clear_outpoint() +void VWindow::unset_inoutpoint() { EDL *edl = get_edl(); if(edl) { - edl->local_session->unset_outpoint(); + edl->unset_inoutpoint(); gui->timebar->update(1); } } @@ -425,10 +413,8 @@ void VWindow::copy() const char *file_string = file.string(); long file_length = strlen(file_string); mwindow->gui->lock_window(); - mwindow->gui->get_clipboard()->to_clipboard(file_string, file_length, - SECONDARY_SELECTION); - mwindow->gui->get_clipboard()->to_clipboard(file_string, file_length, - BC_PRIMARY_SELECTION); + mwindow->gui->to_clipboard(file_string, file_length, BC_PRIMARY_SELECTION); + mwindow->gui->to_clipboard(file_string, file_length, SECONDARY_SELECTION); mwindow->gui->unlock_window(); } }