X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindowedit.C;h=67f4402c73664674a6a0fd74cc3e8804ea2c17fc;hp=3e6c89995254e2ea987929bc9581750609f7879a;hb=15b020d5c21b2cc5545227f7c092f06086666b4a;hpb=ee1879b1a1850e1d4e19c034d4a9c5459274bbb6 diff --git a/cinelerra-5.1/cinelerra/mwindowedit.C b/cinelerra-5.1/cinelerra/mwindowedit.C index 3e6c8999..67f4402c 100644 --- a/cinelerra-5.1/cinelerra/mwindowedit.C +++ b/cinelerra-5.1/cinelerra/mwindowedit.C @@ -41,6 +41,7 @@ #include "gwindow.h" #include "gwindowgui.h" #include "keyframe.h" +#include "keyframes.h" #include "language.h" #include "labels.h" #include "levelwindow.h" @@ -672,7 +673,7 @@ void MWindow::delete_track(Track *track) // Insert data from clipboard void MWindow::insert(double position, FileXML *file, int edit_labels, int edit_plugins, int edit_autos, - EDL *parent_edl) + EDL *parent_edl, Track *first_track, int overwrite) { // For clipboard pasting make the new edl use a separate session // from the master EDL. Then it can be resampled to the master rates. @@ -699,8 +700,8 @@ void MWindow::insert(double position, FileXML *file, - paste_edls(&new_edls, LOADMODE_PASTE, 0, position, - edit_labels, edit_plugins, edit_autos, 0); // overwrite + paste_edls(&new_edls, LOADMODE_PASTE, first_track, position, + edit_labels, edit_plugins, edit_autos, overwrite); // if( vwindow->edl ) // printf("MWindow::insert 5 %f %f\n", // vwindow->edl->local_session->in_point, @@ -830,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"); @@ -903,8 +905,29 @@ void MWindow::match_output_size(Track *track) } -void MWindow::selected_to_clipboard() +EDL *MWindow::selected_edits_to_clip(int packed, + double *start_position, Track **start_track, + int edit_labels, int edit_autos, int edit_plugins) { + double start = DBL_MAX, end = DBL_MIN; + Track *first_track=0, *last_track = 0; + for( Track *track=edl->tracks->first; track; track=track->next ) { + if( !track->record ) continue; + int empty = 1; + for( Edit *edit=track->edits->first; edit; edit=edit->next ) { + if( !edit->is_selected || edit->silence() ) continue; + double edit_pos = track->from_units(edit->startproject); + if( start > edit_pos ) start = edit_pos; + if( end < (edit_pos+=edit->length) ) end = edit_pos; + empty = 0; + } + if( empty ) continue; + if( !first_track ) first_track = track; + last_track = track; + } + if( start_position ) *start_position = start; + if( start_track ) *start_track = first_track; + if( !first_track ) return 0; EDL *new_edl = new EDL(); new_edl->create_objects(); new_edl->copy_session(edl); @@ -915,37 +938,151 @@ void MWindow::selected_to_clipboard() new_edl->session->video_tracks = 0; new_edl->session->audio_tracks = 0; for( Track *track=edl->tracks->first; track; track=track->next ) { - int64_t startproject = 0; + if( !track->record ) continue; + if( first_track ) { + if( first_track != track ) continue; + first_track = 0; + } Track *new_track = 0; - for( Edit *edit=track->edits->first; edit; edit=edit->next ) { - if( !edit->is_selected ) continue; - if( !new_track ) { - switch( track->data_type ) { - case TRACK_VIDEO: - ++new_edl->session->video_tracks; - new_track = new_edl->tracks->add_video_track(0, 0); - break; - case TRACK_AUDIO: - ++new_edl->session->audio_tracks; - new_track = new_edl->tracks->add_audio_track(0, 0); - break; - case TRACK_SUBTITLE: - new_track = new_edl->tracks->add_subttl_track(0, 0); - break; + if( !packed ) + new_track = new_edl->add_new_track(track->data_type); + int64_t start_pos = track->to_units(start, 0); + int64_t end_pos = track->to_units(end, 0); + int64_t startproject = 0; + Edit *edit = track->edits->first; + for( ; edit; edit=edit->next ) { + if( !edit->is_selected || edit->silence() ) continue; + if( edit->startproject < start_pos ) continue; + if( edit->startproject >= end_pos ) break; + int64_t edit_start_pos = edit->startproject; + int64_t edit_end_pos = edit->startproject + edit->length; + if( !new_track ) + new_track = new_edl->add_new_track(track->data_type); + int64_t edit_pos = edit_start_pos - start_pos; + if( !packed && edit_pos > startproject ) { + Edit *silence = new Edit(new_edl, new_track); + silence->startproject = startproject; + silence->length = edit_pos - startproject; + new_track->edits->append(silence); + startproject = edit_pos; + } + int64_t clip_start_pos = startproject; + Edit *clip_edit = new Edit(new_edl, new_track); + clip_edit->copy_from(edit); + clip_edit->startproject = startproject; + startproject += clip_edit->length; + new_track->edits->append(clip_edit); + if( edit_labels ) { + double edit_start = track->from_units(edit_start_pos); + double edit_end = track->from_units(edit_end_pos); + double clip_start = new_track->from_units(clip_start_pos); + Label *label = edl->labels->first; + for( ; label; label=label->next ) { + if( label->position < edit_start ) continue; + if( label->position >= edit_end ) break; + double clip_position = label->position - edit_start + clip_start; + Label *clip_label = new_edl->labels->first; + while( clip_label && clip_label->positionnext; + if( clip_label && clip_label->position == clip_position ) continue; + Label *new_label = new Label(new_edl, + new_edl->labels, clip_position, label->textstr); + new_edl->labels->insert_before(clip_label, new_label); + } + } + if( edit_autos ) { + Automation *automation = track->automation; + Automation *new_automation = new_track->automation; + for( int i=0; iautos[i]; + if( !autos ) continue; + Autos *new_autos = new_automation->autos[i]; + new_autos->default_auto->copy_from(autos->default_auto); + Auto *aut0 = autos->first; + for( ; aut0; aut0=aut0->next ) { + if( aut0->position < edit_start_pos ) continue; + if( aut0->position >= edit_end_pos ) break; + Auto *new_auto = new_autos->new_auto(); + new_auto->copy_from(aut0); + int64_t clip_position = aut0->position - edit_start_pos + clip_start_pos; + new_auto->position = clip_position; + new_autos->append(new_auto); + } } } - if( new_track ) { - Edit *clip_edit = new Edit(new_edl, new_track); - clip_edit->copy_from(edit); - clip_edit->startproject = startproject; - startproject += clip_edit->length; - new_track->edits->append(clip_edit); + if( edit_plugins ) { + while( new_track->plugin_set.size() < track->plugin_set.size() ) + new_track->plugin_set.append(0); + for( int i=0; iplugin_set.total; ++i ) { + PluginSet *plugin_set = track->plugin_set[i]; + if( !plugin_set ) continue; + PluginSet *new_plugin_set = new_track->plugin_set[i]; + if( !new_plugin_set ) { + new_plugin_set = new PluginSet(new_edl, new_track); + new_track->plugin_set[i] = new_plugin_set; + } + Plugin *plugin = (Plugin*)plugin_set->first; + int64_t startplugin = new_plugin_set->length(); + for( ; plugin ; plugin=(Plugin*)plugin->next ) { + if( plugin->silence() ) continue; + int64_t plugin_start_pos = plugin->startproject; + int64_t plugin_end_pos = plugin_start_pos + plugin->length; + if( plugin_end_pos < start_pos ) continue; + if( plugin_start_pos > end_pos ) break; + if( plugin_start_pos < edit_start_pos ) + plugin_start_pos = edit_start_pos; + if( plugin_end_pos > edit_end_pos ) + plugin_end_pos = edit_end_pos; + if( plugin_start_pos >= plugin_end_pos ) continue; + int64_t plugin_pos = plugin_start_pos - start_pos; + if( !packed && plugin_pos > startplugin ) { + Plugin *silence = new Plugin(new_edl, new_track, ""); + silence->startproject = startplugin; + silence->length = plugin_pos - startplugin; + new_plugin_set->append(silence); + startplugin = plugin_pos; + } + Plugin *new_plugin = new Plugin(new_edl, new_track, plugin->title); + new_plugin->copy_base(plugin); + new_plugin->startproject = startplugin; + new_plugin->length = plugin_end_pos - plugin_start_pos; + startplugin += new_plugin->length; + new_plugin_set->append(new_plugin); + KeyFrames *keyframes = plugin->keyframes; + KeyFrames *new_keyframes = new_plugin->keyframes; + new_keyframes->default_auto->copy_from(keyframes->default_auto); + new_keyframes->default_auto->position = new_plugin->startproject; + KeyFrame *keyframe = (KeyFrame*)keyframes->first; + for( ; keyframe; keyframe=(KeyFrame*)keyframe->next ) { + if( keyframe->position < edit_start_pos ) continue; + if( keyframe->position >= edit_end_pos ) break; + KeyFrame *clip_keyframe = new KeyFrame(new_edl, new_keyframes); + clip_keyframe->copy_from(keyframe); + int64_t key_position = keyframe->position - start_pos; + if( packed ) + key_position += new_plugin->startproject - plugin_pos; + clip_keyframe->position = key_position; + new_keyframes->append(clip_keyframe); + } + } + } } } + if( last_track == track ) break; } + return new_edl; +} + +void MWindow::selected_edits_to_clipboard(int packed) +{ + EDL *new_edl = selected_edits_to_clip(packed, 0, 0, + edl->session->labels_follow_edits, + edl->session->autos_follow_edits, + edl->session->plugins_follow_edits); + if( !new_edl ) return; double length = new_edl->tracks->total_length(); FileXML file; - new_edl->copy(0, length, 0, &file, "", 1); + new_edl->copy(0, length, 1, &file, "", 1); const char *file_string = file.string(); long file_length = strlen(file_string); gui->to_clipboard(file_string, file_length, BC_PRIMARY_SELECTION); @@ -964,17 +1101,9 @@ void MWindow::delete_edits(ArrayList *edits, const char *msg, int collaps { if( !edits->size() ) return; undo->update_undo_before(); - for( Track *track=edl->tracks->first; track; track=track->next ) { - for( Edit *next=track->edits->first; next; ) { - Edit *edit = next; next = edit->next; - if( !edit->is_selected ) continue; - int64_t len = edit->length; - delete edit; - if( !collapse ) continue; - for( edit=next; edit; edit=edit->next ) - edit->startproject -= len; - } - } + 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); @@ -992,9 +1121,11 @@ void MWindow::delete_edits(int collapse) delete_edits(&edits,_("del edit"), collapse); } -void MWindow::cut_selected_edits(int collapse) +// collapse - delete from timeline, not collapse replace with silence +// packed - omit unselected from selection, unpacked - replace unselected with silence +void MWindow::cut_selected_edits(int collapse, int packed) { - selected_to_clipboard(); + selected_edits_to_clipboard(packed); ArrayList edits; edl->tracks->get_selected_edits(&edits); delete_edits(&edits, _("cut edit"), collapse); @@ -1002,19 +1133,18 @@ void MWindow::cut_selected_edits(int collapse) void MWindow::move_edits(ArrayList *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); @@ -1026,6 +1156,190 @@ void MWindow::move_edits(ArrayList *edits, gui->update(1, NORMAL_DRAW, 1, 0, 0, 0, 0); } +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( !first_track ) + first_track = edl->tracks->first; + Track *src = clip->tracks->first; + for( Track *track=first_track; track && src; track=track->next ) { + if( !track->record ) continue; + int64_t pos = track->to_units(position, 0); + if( edit_edits ) { + for( Edit *edit=src->edits->first; edit; edit=edit->next ) { + if( edit->silence() ) continue; + int64_t start = pos + edit->startproject; + int64_t len = edit->length, end = start + len; + if( overwrite ) + track->edits->clear(start, end); + Edit *dst = track->edits->insert_new_edit(start); + dst->copy_from(edit); + dst->startproject = start; + 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; iautomation->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; iplugin_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 ) { + for( int i=0; iautomation->autos[i]; + if( !src_autos ) continue; + Autos *autos = track->automation->autos[i]; + for( Auto *aut0=src_autos->first; aut0; aut0=aut0->next ) { + int64_t auto_pos = pos + aut0->position; + autos->insert_auto(auto_pos, aut0); + } + } + } + if( edit_plugins ) { + for( int i=0; iplugin_set.size(); ++i ) { + PluginSet *plugin_set = src->plugin_set[i]; + if( !plugin_set ) continue; + while( i >= track->plugin_set.size() ) + track->plugin_set.append(0); + PluginSet *dst_plugin_set = track->plugin_set[i]; + if( !dst_plugin_set ) { + dst_plugin_set = new PluginSet(edl, track); + track->plugin_set[i] = dst_plugin_set; + } + Plugin *plugin = (Plugin *)plugin_set->first; + if( plugin ) track->expand_view = 1; + for( ; plugin; plugin=(Plugin *)plugin->next ) { + int64_t start = pos + plugin->startproject; + int64_t end = start + plugin->length; + if( overwrite || edit_edits ) + dst_plugin_set->clear(start, end, 1); + 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; + 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; + } + } + } + } + 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, + int edit_edits, int edit_labels, int edit_autos, int edit_plugins) +{ + int64_t len = gui->clipboard_len(BC_PRIMARY_SELECTION); + if( !len ) return; + char *string = new char[len]; + gui->from_clipboard(string, len, BC_PRIMARY_SELECTION); + FileXML file; + file.read_from_string(string); + delete [] string; + EDL *clip = new EDL(); + clip->create_objects(); + if( !clip->load_xml(&file, LOAD_ALL) ) { + undo->update_undo_before(); + paste_edits(clip, first_track, position, overwrite, + edit_edits, edit_labels, edit_autos, edit_plugins); + save_backup(); + undo->update_undo_after(_("paste clip"), LOAD_ALL); + restart_brender(); + cwindow->refresh_frame(CHANGE_EDL); + + update_plugin_guis(); + gui->update(1, NORMAL_DRAW, 1, 0, 0, 0, 0); + } + clip->remove_user(); +} + +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(); + + save_backup(); + undo->update_undo_after(_("move group"), LOAD_ALL); + restart_brender(); + cwindow->refresh_frame(CHANGE_EDL); + + update_plugin_guis(); + gui->update(1, NORMAL_DRAW, 1, 0, 0, 0, 0); +} + void MWindow::move_effect(Plugin *plugin, Track *track, int64_t position) { undo->update_undo_before(); @@ -1187,8 +1501,7 @@ void MWindow::overwrite(EDL *source, int all) edl->local_session->get_outpoint() < 0 ) edl->clear(dst_start, dst_start + overwrite_len, 0, 0, 0); - paste(dst_start, dst_start + overwrite_len, - &file, 0, 0, 0); + paste(dst_start, dst_start + overwrite_len, &file, 0, 0, 0, 0, 0); edl->local_session->set_selectionstart(dst_start + overwrite_len); edl->local_session->set_selectionend(dst_start + overwrite_len); @@ -1203,19 +1516,16 @@ void MWindow::overwrite(EDL *source, int all) } // For splice and overwrite -int MWindow::paste(double start, - double end, - FileXML *file, - int edit_labels, - int edit_plugins, - int edit_autos) +int MWindow::paste(double start, double end, FileXML *file, + int edit_labels, int edit_plugins, int edit_autos, + Track *first_track, int overwrite) { clear(0); // Want to insert with assets shared with the master EDL. insert(start, file, edit_labels, edit_plugins, edit_autos, - edl); + edl, first_track, overwrite); return 0; } @@ -1223,7 +1533,11 @@ int MWindow::paste(double start, // For editing using insertion point void MWindow::paste() { - double start = edl->local_session->get_selectionstart(); + paste(edl->local_session->get_selectionstart(), 0, 1, 0); +} + +void MWindow::paste(double start, Track *first_track, int clear_selection, int overwrite) +{ //double end = edl->local_session->get_selectionend(); int64_t len = gui->clipboard_len(BC_PRIMARY_SELECTION); @@ -1233,13 +1547,13 @@ void MWindow::paste() gui->from_clipboard(string, len, BC_PRIMARY_SELECTION); FileXML file; file.read_from_string(string); - clear(0); + if( clear_selection ) clear(0); insert(start, &file, edl->session->labels_follow_edits, edl->session->plugins_follow_edits, edl->session->autos_follow_edits, - 0); + 0, first_track, overwrite); edl->optimize(); delete [] string; @@ -1579,7 +1893,7 @@ int MWindow::paste_edls(ArrayList *new_edls, int load_mode, edl_length, edit_labels); //PRINT_TRACE - + double total_length = new_edl->tracks->total_length(); for( Track *new_track=new_edl->tracks->first; new_track; new_track=new_track->next ) { // Get destination track of same type as new_track @@ -1618,11 +1932,12 @@ int MWindow::paste_edls(ArrayList *new_edls, int load_mode, break; } if( overwrite ) { + double length = overwrite >= 0 ? + new_track->get_length() : total_length; track->clear(current_position, - current_position + new_track->get_length(), + current_position + length, 1, // edit edits edit_labels, edit_plugins, edit_autos, - 1, // convert units 0); // trim edits } //PRINT_TRACE @@ -2104,7 +2419,8 @@ void MWindow::splice(EDL *source, int all) paste(start, start, &file, edl->session->labels_follow_edits, edl->session->plugins_follow_edits, - edl->session->autos_follow_edits); + edl->session->autos_follow_edits, + 0, 0); // Position at end of clip edl->local_session->set_selectionstart(start + source_end - source_start);