18 new shapewipe transitions from rafa, rework savefile/confirm for nested edl edits

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / pluginset.C

diff --git a/cinelerra-5.1/cinelerra/pluginset.C b/cinelerra-5.1/cinelerra/pluginset.C
index cdc4a7848d1bd7faa778d3bf6274521afc253ea2..575f04651ce78c10fc33d24958b618ecb4c65ac4 100644 (file)
--- a/cinelerra-5.1/cinelerra/pluginset.C
+++ b/cinelerra-5.1/cinelerra/pluginset.C
@@ -44,13 +44,6 @@ PluginSet::~PluginSet()
 }
 
 
-PluginSet& PluginSet::operator=(PluginSet& plugins)
-{
-printf("PluginSet::operator= 1\n");
-       copy_from(&plugins);
-       return *this;
-}
-
 void PluginSet::copy_from(PluginSet *src)
 {
        while(last) delete last;
@@ -59,6 +52,8 @@ void PluginSet::copy_from(PluginSet *src)
                Plugin *new_plugin;
                append(new_plugin = (Plugin*)create_edit());
                new_plugin->copy_from(current);
+// update gui_id when copying edl
+               new_plugin->gui_id = current->gui_id;
        }
        this->record = src->record;
 }
@@ -165,6 +160,10 @@ Edit* PluginSet::insert_edit_after(Edit *previous_edit)
 
 KeyFrame *PluginSet::nearest_keyframe(int64_t pos, int dir)
 {
+       if( first && pos < first->startproject )
+               pos = first->startproject;
+       else if( last && pos > last->startproject+last->length )
+               pos = last->startproject+last->length;
        Plugin *plugin = (Plugin*)editof(pos, dir, 0);
        if( !plugin ) return 0;
        KeyFrame *keyframe = (KeyFrame *)(dir == PLAY_FORWARD ?
@@ -343,6 +342,19 @@ void PluginSet::shift_effects(int64_t start, int64_t length, int edit_autos)
        }
 }
 
+void PluginSet::paste_silence(int64_t start, int64_t end, int edit_autos)
+{
+       Plugin *new_plugin = (Plugin *) insert_new_edit(start);
+       int64_t length = end - start;
+       new_plugin->length = length;
+       while( (new_plugin=(Plugin *)new_plugin->next) != 0 ) {
+               new_plugin->startproject += length;
+               if( !edit_autos ) continue;
+               new_plugin->keyframes->default_auto->position += length;
+               new_plugin->keyframes->paste_silence(start, end);
+       }
+}
+
 void PluginSet::copy(int64_t start, int64_t end, FileXML *file)
 {
        file->tag.set_title("PLUGINSET");
@@ -429,6 +441,13 @@ int PluginSet::optimize()
        int result = 1;
        Plugin *current_edit;
 
+// trim plugins before position 0
+       while( first && first->startproject+first->length < 0 )
+               delete first;
+       if( first && first->startproject < 0 ) {
+               first->length += first->startproject;
+               first->startproject = 0;
+       }
 
 // Delete keyframes out of range
        for(current_edit = (Plugin*)first;