X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindowedit.C;h=7249f67ac9d5db56c0d48c6dbb807ed00d0ceca2;hp=c64ab7c158c943d1161c579512cd386f5a241361;hb=2a56d102d9db53017b306f2a61a2382f29a75783;hpb=ab209efd7893132268c7dc159cd78a4574276946 diff --git a/cinelerra-5.1/cinelerra/mwindowedit.C b/cinelerra-5.1/cinelerra/mwindowedit.C index c64ab7c1..7249f67a 100644 --- a/cinelerra-5.1/cinelerra/mwindowedit.C +++ b/cinelerra-5.1/cinelerra/mwindowedit.C @@ -825,15 +825,13 @@ void MWindow::insert_effect(char *title, int MWindow::modify_edithandles() { undo->update_undo_before(); + int handle_mode = edl->session->edit_handle_mode[session->drag_button]; edl->modify_edithandles(session->drag_start, - session->drag_position, - session->drag_handle, - edl->session->edit_handle_mode[session->drag_button], + session->drag_position, session->drag_handle, handle_mode, edl->session->labels_follow_edits, edl->session->plugins_follow_edits, edl->session->autos_follow_edits, session->drag_edit->group_id); - finish_modify_handles(); //printf("MWindow::modify_handles 1\n"); return 0; @@ -861,24 +859,21 @@ int MWindow::modify_pluginhandles() void MWindow::finish_modify_handles() { int edit_mode = edl->session->edit_handle_mode[session->drag_button]; - - if( (session->drag_handle == 1 && edit_mode != MOVE_NO_EDITS) || - (session->drag_handle == 0 && edit_mode == MOVE_ONE_EDIT) ) { -//printf("MWindow::finish_modify_handles %d\n", __LINE__); - edl->local_session->set_selectionstart(session->drag_position); - edl->local_session->set_selectionend(session->drag_position); - } - else - if( edit_mode != MOVE_NO_EDITS ) { -//printf("MWindow::finish_modify_handles %d\n", __LINE__); - edl->local_session->set_selectionstart(session->drag_start); - edl->local_session->set_selectionend(session->drag_start); - } - -// clamp the selection to 0 - if( edl->local_session->get_selectionstart(1) < 0 ) { - edl->local_session->set_selectionstart(0); - edl->local_session->set_selectionend(0); + double position = -1; + switch( edit_mode ) { + case MOVE_RIPPLE: + case MOVE_ROLL: + case MOVE_SLIDE: + position = session->drag_position; + break; + case MOVE_SLIP: + case MOVE_EDGE: + position = session->drag_start; + break; + } + if( position >= 0 ) { + edl->local_session->set_selectionstart(position); + edl->local_session->set_selectionend(position); } undo->update_undo_after(_("drag handle"), LOAD_EDITS | LOAD_TIMEBAR); @@ -1101,6 +1096,8 @@ void MWindow::delete_edits(ArrayList *edits, const char *msg, int collaps { if( !edits->size() ) return; undo->update_undo_before(); + if( edl->session->labels_follow_edits ) + edl->delete_edit_labels(edits, collapse); edl->delete_edits(edits, collapse); edl->optimize(); save_backup(); @@ -1131,22 +1128,18 @@ void MWindow::cut_selected_edits(int collapse, int packed) void MWindow::move_edits(ArrayList *edits, - Track *track, - double position, - int behaviour) + Track *track, double position, int mode) { undo->update_undo_before(); - - EDL *clip = selected_edits_to_clip(0, 0, 0, +// lockout timebar labels update +// labels can be deleted with tooltip repeater running + cwindow->gui->lock_window("Tracks::move_edits"); + edl->tracks->move_edits(edits, track, position, edl->session->labels_follow_edits, - edl->session->autos_follow_edits, - edl->session->plugins_follow_edits); - edl->delete_edits(edits, 0); - paste_edits(clip, track, position, behaviour, 1, - edl->session->labels_follow_edits, - edl->session->autos_follow_edits, - edl->session->plugins_follow_edits); - edl->tracks->clear_selected_edits(); + edl->session->plugins_follow_edits, + edl->session->autos_follow_edits, mode); + cwindow->gui->timebar->update(1); + cwindow->gui->unlock_window(); save_backup(); undo->update_undo_after(_("move edit"), LOAD_ALL); @@ -1207,7 +1200,7 @@ void MWindow::paste_edits(EDL *clip, Track *first_track, double position, int ov if( plugin->startproject >= start ) plugin->startproject += edit->length; else if( plugin->startproject+plugin->length > end ) - plugin->length += end - start; + plugin->length += edit->length; Auto *default_keyframe = plugin->keyframes->default_auto; if( default_keyframe->position >= start ) default_keyframe->position += edit->length; @@ -1259,6 +1252,11 @@ void MWindow::paste_edits(EDL *clip, Track *first_track, double position, int ov int64_t keyframe_pos = pos + keyframe->position; new_plugin->keyframes->insert_auto(keyframe_pos, keyframe); } + while( (new_plugin=(Plugin *)new_plugin->next) ) { + KeyFrame *keyframe = (KeyFrame*)new_plugin->keyframes->first; + for( ; keyframe; keyframe=(KeyFrame*)keyframe->next ) + keyframe->position += plugin->length; + } } } } @@ -1310,14 +1308,21 @@ void MWindow::paste_clipboard(Track *first_track, double position, int overwrite void MWindow::move_group(EDL *group, Track *first_track, double position, int overwrite) { undo->update_undo_before(); +// lockout timebar labels update +// labels can be deleted with tooltip repeater running + cwindow->gui->lock_window("Tracks::move_group"); ArrayListedits; edl->tracks->get_selected_edits(&edits); + if( edl->session->labels_follow_edits ) + edl->delete_edit_labels(&edits, 0); edl->delete_edits(&edits, 0); paste_edits(group, first_track, position, overwrite, 1, edl->session->labels_follow_edits, edl->session->autos_follow_edits, edl->session->plugins_follow_edits); + cwindow->gui->timebar->update(1); + cwindow->gui->unlock_window(); // big debate over whether to do this, must either clear selected, or no tweaking // edl->tracks->clear_selected_edits(); @@ -1870,18 +1875,16 @@ int MWindow::paste_edls(ArrayList *new_edls, int load_mode, if( load_mode != LOADMODE_RESOURCESONLY && load_mode != LOADMODE_ASSETSONLY ) { // Insert labels + if( edl->session->labels_follow_edits ) { //printf("MWindow::paste_edls %f %f\n", current_position, edl_length); - if( load_mode == LOADMODE_PASTE || - load_mode == LOADMODE_NESTED ) - edl->labels->insert_labels(new_edl->labels, - destination_tracks.total ? paste_position[0] : 0.0, - edl_length, - edit_labels); - else - edl->labels->insert_labels(new_edl->labels, - current_position, - edl_length, - edit_labels); + if( load_mode == LOADMODE_PASTE || load_mode == LOADMODE_NESTED ) + edl->labels->insert_labels(new_edl->labels, + destination_tracks.total ? paste_position[0] : 0.0, + edl_length, edit_labels); + else + edl->labels->insert_labels(new_edl->labels, current_position, + edl_length, edit_labels); + } //PRINT_TRACE double total_length = new_edl->tracks->total_length(); for( Track *new_track=new_edl->tracks->first;