switch move/swap tracks, add mv trk shortcut, update msg

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / assetpopup.h

diff --git a/cinelerra-5.1/cinelerra/assetpopup.h b/cinelerra-5.1/cinelerra/assetpopup.h
index 129cd335f0ff29e44c67db6098b4577512c90195..c948e0e135c81a1627cad4575dac7147bd4bfc03 100644 (file)
--- a/cinelerra-5.1/cinelerra/assetpopup.h
+++ b/cinelerra-5.1/cinelerra/assetpopup.h
@@ -51,11 +51,17 @@ public:
 
 
        AssetPopupInfo *info;
+       AWindowListFormat *format;
+       AssetPopupOpenEDL *open_edl;
+       AssetPopupCloseEDL *close_edl;
+       AssetPopupToClip *to_clip;
+       AssetPopupSort *sort;
        AssetPopupBuildIndex *index;
        AssetPopupView *view;
        AssetPopupViewWindow *view_window;
-       AssetPopupMixer *mixer;
-       AWindowListFormat *format;
+       AssetPopupOpenMixer *open_mixer;
+       AssetPopupInsertMixer *insert_mixer;
+       AssetPopupPaste *paste;
 };
 
 class AssetPopupInfo : public BC_MenuItem
@@ -71,6 +77,42 @@ public:
        AssetPopup *popup;
 };
 
+class AssetPopupOpenEDL : public BC_MenuItem
+{
+public:
+       AssetPopupOpenEDL(MWindow *mwindow, AssetPopup *popup);
+       ~AssetPopupOpenEDL();
+
+       int handle_event();
+
+       MWindow *mwindow;
+       AssetPopup *popup;
+};
+
+class AssetPopupCloseEDL : public BC_MenuItem
+{
+public:
+       AssetPopupCloseEDL(MWindow *mwindow, AWindowGUI *gui);
+       ~AssetPopupCloseEDL();
+
+       int handle_event();
+
+       MWindow *mwindow;
+       AWindowGUI *gui;
+};
+
+class AssetPopupToClip : public BC_MenuItem
+{
+public:
+       AssetPopupToClip(MWindow *mwindow, AssetPopup *popup);
+       ~AssetPopupToClip();
+
+       int handle_event();
+
+       MWindow *mwindow;
+       AssetPopup *popup;
+};
+
 class AssetPopupSort : public BC_MenuItem
 {
 public:
@@ -121,11 +163,23 @@ public:
        AssetPopup *popup;
 };
 
-class AssetPopupMixer : public BC_MenuItem
+class AssetPopupOpenMixer : public BC_MenuItem
+{
+public:
+       AssetPopupOpenMixer(MWindow *mwindow, AssetPopup *popup);
+       ~AssetPopupOpenMixer();
+
+       int handle_event();
+
+       MWindow *mwindow;
+       AssetPopup *popup;
+};
+
+class AssetPopupInsertMixer : public BC_MenuItem
 {
 public:
-       AssetPopupMixer(MWindow *mwindow, AssetPopup *popup);
-       ~AssetPopupMixer();
+       AssetPopupInsertMixer(MWindow *mwindow, AssetPopup *popup);
+       ~AssetPopupInsertMixer();
 
        int handle_event();
 
@@ -215,9 +269,10 @@ public:
        AWindowGUI *gui;
        AssetPopupLoadFile *load_file;
        AWindowListFormat *format;
+       AssetPopupCloseEDL *close_edl;
        AssetSnapshot *asset_snapshot;
        AssetGrabshot *asset_grabshot;
-       int shots_displayed;
+       AssetSelectUsed *select_used;
 };
 
 class AssetPopupLoadFile : public BC_MenuItem