fast drag/drop rework, modify labels in mwin->cwin locks, mods to cut/paste, marks...
[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / mwindowedit.C
index 9711719aea4164ec700e5d67f92866ec3715529c..67f4402c73664674a6a0fd74cc3e8804ea2c17fc 100644 (file)
@@ -831,7 +831,8 @@ int MWindow::modify_edithandles()
                edl->session->edit_handle_mode[session->drag_button],
                edl->session->labels_follow_edits,
                edl->session->plugins_follow_edits,
-               edl->session->autos_follow_edits);
+               edl->session->autos_follow_edits,
+               session->drag_edit->group_id);
 
        finish_modify_handles();
 //printf("MWindow::modify_handles 1\n");
@@ -1100,7 +1101,10 @@ void MWindow::delete_edits(ArrayList<Edit*> *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();
        undo->update_undo_after(msg, LOAD_EDITS);
 
@@ -1129,19 +1133,18 @@ void MWindow::cut_selected_edits(int collapse, int packed)
 
 
 void MWindow::move_edits(ArrayList<Edit*> *edits,
-               Track *track,
-               double position,
-               int behaviour)
+               Track *track, double position, int mode)
 {
        undo->update_undo_before();
-
-       edl->tracks->move_edits(edits,
-               track,
-               position,
+// 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->plugins_follow_edits,
-               edl->session->autos_follow_edits,
-               behaviour);
+               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);
@@ -1156,20 +1159,6 @@ void MWindow::move_edits(ArrayList<Edit*> *edits,
 void MWindow::paste_edits(EDL *clip, Track *first_track, double position, int overwrite,
                int edit_edits, int edit_labels, int edit_autos, int edit_plugins)
 {
-       if( edit_labels ) {
-               Label *edl_label = edl->labels->first;
-               for( Label *label=clip->labels->first; label; label=label->next ) {
-                       double label_pos = position + label->position;
-                       int exists = 0;
-                       while( edl_label &&
-                               !(exists=edl->equivalent(edl_label->position, label_pos)) &&
-                               edl_label->position < position ) edl_label = edl_label->next;
-                       if( exists ) continue;
-                       edl->labels->insert_before(edl_label,
-                               new Label(edl, edl->labels, label_pos, label->textstr));
-               }
-       }
-
        if( !first_track )
                first_track = edl->tracks->first;
        Track *src = clip->tracks->first;
@@ -1180,7 +1169,7 @@ void MWindow::paste_edits(EDL *clip, Track *first_track, double position, int ov
                        for( Edit *edit=src->edits->first; edit; edit=edit->next ) {
                                if( edit->silence() ) continue;
                                int64_t start = pos + edit->startproject;
-                               int64_t end = start + edit->length;
+                               int64_t len = edit->length, end = start + len;
                                if( overwrite )
                                        track->edits->clear(start, end);
                                Edit *dst = track->edits->insert_new_edit(start);
@@ -1189,6 +1178,46 @@ void MWindow::paste_edits(EDL *clip, Track *first_track, double position, int ov
                                dst->is_selected = 1;
                                while( (dst=dst->next) != 0 )
                                        dst->startproject += edit->length;
+                               if( overwrite ) continue;
+                               if( edit_labels && track == first_track ) {
+                                       double dst_pos = track->from_units(start);
+                                       double dst_len = track->from_units(len);
+                                       for( Label *label=edl->labels->first; label; label=label->next ) {
+                                               if( label->position >= dst_pos )
+                                                       label->position += dst_len;
+                                       }
+                               }
+                               if( edit_autos ) {
+                                       for( int i=0; i<AUTOMATION_TOTAL; ++i ) {
+                                               Autos *autos = track->automation->autos[i];
+                                               if( !autos ) continue;
+                                               for( Auto *aut0=autos->first; aut0; aut0=aut0->next ) {
+                                                       if( aut0->position >= start )
+                                                               aut0->position += edit->length;
+                                               }
+                                       }
+                               }
+                               if( edit_plugins ) {
+                                       for( int i=0; i<track->plugin_set.size(); ++i ) {
+                                               PluginSet *plugin_set = track->plugin_set[i];
+                                               Plugin *plugin = (Plugin *)plugin_set->first;
+                                               for( ; plugin; plugin=(Plugin *)plugin->next ) {
+                                                       if( plugin->startproject >= start )
+                                                               plugin->startproject += edit->length;
+                                                       else if( plugin->startproject+plugin->length > end )
+                                                               plugin->length += edit->length;
+                                                       Auto *default_keyframe = plugin->keyframes->default_auto;
+                                                       if( default_keyframe->position >= start )
+                                                               default_keyframe->position += edit->length;
+                                                       KeyFrame *keyframe = (KeyFrame*)plugin->keyframes->first;
+                                                       for( ; keyframe; keyframe=(KeyFrame*)keyframe->next ) {
+                                                               if( keyframe->position >= start )
+                                                                       keyframe->position += edit->length;
+                                                       }
+                                               }
+                                               plugin_set->optimize();
+                                       }
+                               }
                        }
                }
                if( edit_autos ) {
@@ -1218,23 +1247,40 @@ void MWindow::paste_edits(EDL *clip, Track *first_track, double position, int ov
                                for( ; plugin; plugin=(Plugin *)plugin->next ) {
                                        int64_t start = pos + plugin->startproject;
                                        int64_t end = start + plugin->length;
-                                       if( overwrite )
+                                       if( overwrite || edit_edits )
                                                dst_plugin_set->clear(start, end, 1);
-                                       Plugin *dst = dst_plugin_set->insert_plugin(
-                                               plugin->title, start, end-start,
-                                               plugin->plugin_type, &plugin->shared_location,
+                                       Plugin *new_plugin = dst_plugin_set->insert_plugin(plugin->title,
+                                               start, end-start, plugin->plugin_type, &plugin->shared_location,
                                                (KeyFrame*)plugin->keyframes->default_auto, 0);
                                        KeyFrame *keyframe = (KeyFrame*)plugin->keyframes->first;
                                        for( ; keyframe; keyframe=(KeyFrame*)keyframe->next ) {
                                                int64_t keyframe_pos = pos + keyframe->position;
-                                               dst->keyframes->insert_auto(keyframe_pos, keyframe);
+                                               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;
                                        }
                                }
                        }
                }
-               track->optimize();
                src = src->next;
        }
+       if( edit_labels ) {
+               Label *edl_label = edl->labels->first;
+               for( Label *label=clip->labels->first; label; label=label->next ) {
+                       double label_pos = position + label->position;
+                       int exists = 0;
+                       while( edl_label &&
+                               !(exists=edl->equivalent(edl_label->position, label_pos)) &&
+                               edl_label->position < position ) edl_label = edl_label->next;
+                       if( exists ) continue;
+                       edl->labels->insert_before(edl_label,
+                               new Label(edl, edl->labels, label_pos, label->textstr));
+               }
+       }
+       edl->optimize();
 }
 
 void MWindow::paste_clipboard(Track *first_track, double position, int overwrite,
@@ -1264,14 +1310,24 @@ void MWindow::paste_clipboard(Track *first_track, double position, int overwrite
        clip->remove_user();
 }
 
-void MWindow::move_group(EDL *group, Track *first_track, double position)
+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");
 
        ArrayList<Edit *>edits;
        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, 1, 1, 1, 1, 1);
+       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();