X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindowedit.C;h=e300053dc427bdeee6da69e55792fe24ac424139;hb=2ba7e9962ea989863e152373e96a09b00a0b4eb8;hp=f4df668bf192ac8a55d30ba30cd457fc48cf663a;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/mwindowedit.C b/cinelerra-5.1/cinelerra/mwindowedit.C index f4df668b..e300053d 100644 --- a/cinelerra-5.1/cinelerra/mwindowedit.C +++ b/cinelerra-5.1/cinelerra/mwindowedit.C @@ -121,13 +121,7 @@ void MWindow::add_video_track_entry(Track *dst) restart_brender(); - gui->update(1, - 1, - 0, - 0, - 1, - 0, - 0); + gui->update(1, 1, 0, 0, 1, 0, 0); gui->activate_timeline(); // gui->get_scrollbars(0); // gui->canvas->draw(); @@ -135,10 +129,8 @@ void MWindow::add_video_track_entry(Track *dst) // gui->cursor->draw(1); // gui->canvas->flash(); // gui->canvas->activate(); - cwindow->playback_engine->que->send_command(CURRENT_FRAME, - CHANGE_EDL, - edl, - 1); + cwindow->playback_engine->que-> + send_command(CURRENT_FRAME, CHANGE_EDL, edl, 1); save_backup(); } @@ -149,16 +141,17 @@ void MWindow::add_subttl_track_entry(Track *dst) undo->update_undo_after(_("add track"), LOAD_ALL); restart_brender(); + + gui->update(1, 1, 0, 0, 1, 0, 0); + gui->activate_timeline(); // gui->get_scrollbars(0); // gui->canvas->draw(); // gui->patchbay->update(); // gui->cursor->draw(1); // gui->canvas->flash(); // gui->canvas->activate(); - cwindow->playback_engine->que->send_command(CURRENT_FRAME, - CHANGE_EDL, - edl, - 1); + cwindow->playback_engine->que-> + send_command(CURRENT_FRAME, CHANGE_EDL, edl, 1); save_backup(); } @@ -673,6 +666,7 @@ int MWindow::cut_default_keyframe() return 0; } + void MWindow::delete_inpoint() { edl->local_session->unset_inpoint(); @@ -685,6 +679,7 @@ void MWindow::delete_outpoint() save_backup(); } + void MWindow::delete_track() { if (edl->tracks->last) @@ -700,11 +695,10 @@ void MWindow::delete_tracks() restart_brender(); update_plugin_states(); + gui->update(1, 1, 1, 0, 1, 0, 0); - cwindow->playback_engine->que->send_command(CURRENT_FRAME, - CHANGE_EDL, - edl, - 1); + cwindow->playback_engine->que-> + send_command(CURRENT_FRAME, CHANGE_EDL, edl, 1); } void MWindow::delete_track(Track *track) @@ -715,18 +709,14 @@ void MWindow::delete_track(Track *track) restart_brender(); update_plugin_states(); + gui->update(1, 1, 1, 0, 1, 0, 0); - cwindow->playback_engine->que->send_command(CURRENT_FRAME, - CHANGE_EDL, - edl, - 1); + cwindow->playback_engine->que-> + send_command(CURRENT_FRAME, CHANGE_EDL, edl, 1); save_backup(); } - - - // Insert data from clipboard void MWindow::insert(double position, FileXML *file, @@ -2456,6 +2446,8 @@ int MWindow::toggle_label(int is_mwindow) cwindow->gui->unlock_window(); } + awindow->gui->async_update_assets(); + undo->update_undo_after(_("label"), LOAD_TIMEBAR); return 0; }