fix awdw solo vicon crash, fix nested clip for binfolders, open edit edl

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

diff --git a/cinelerra-5.1/cinelerra/editpopup.C b/cinelerra-5.1/cinelerra/editpopup.C
index 2011bcf84cd0a43141c55735b49e78d9504bf3fc..45d7d87a0a696e918e9fb337d97de799858c1b27 100644 (file)
--- a/cinelerra-5.1/cinelerra/editpopup.C
+++ b/cinelerra-5.1/cinelerra/editpopup.C
@@ -75,7 +75,10 @@ void EditPopup::create_objects()
        add_item(new EditPopupMutePack(mwindow, this));
        add_item(new EditPopupPaste(mwindow, this));
        add_item(new EditPopupOverwrite(mwindow, this));
+       add_item(new BC_MenuItem("-"));
        add_item(new EditPopupOverwritePlugins(mwindow, this));
+       add_item(new EditCollectEffects(mwindow, this));
+       add_item(new EditPasteEffects(mwindow, this));
 }
 
 int EditPopup::activate_menu(Track *track, Edit *edit,
@@ -136,7 +139,7 @@ int EditPopupOpenEDL::handle_event()
                eprintf(_("Edit is not EDL: %s"), edit_title);
                return 1;
        }
-       mwindow->stack_push(edl, idxbl);
+       mwindow->stack_push(edl, idxbl, edit);
        return 1;
 }
 
@@ -304,3 +307,36 @@ int EditPopupOverwritePlugins::handle_event()
        return 1;
 }
 
+
+EditCollectEffects::EditCollectEffects(MWindow *mwindow, EditPopup *popup)
+ : BC_MenuItem(_("Collect Effects"))
+{
+       this->mwindow = mwindow;
+       this->popup = popup;
+       set_ctrl(1);
+}
+
+int EditCollectEffects::handle_event()
+{
+       if( mwindow->session->current_operation == NO_OPERATION )
+               mwindow->collect_effects();
+       return 1;
+}
+
+EditPasteEffects::EditPasteEffects(MWindow *mwindow, EditPopup *popup)
+ : BC_MenuItem(_("Paste Effects"))
+{
+       this->mwindow = mwindow;
+       this->popup = popup;
+       set_ctrl(1);
+       set_shift(1);
+}
+
+int EditPasteEffects::handle_event()
+{
+       if( mwindow->session->current_operation == NO_OPERATION )
+               mwindow->paste_effects();
+       return 1;
+}
+
+