ins mixers, match all and move for mixer align, cr in xml string kludge, save_as...

[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..eea5a8eacb6019f2718ff0b75e5c2548ee73152c 100644 (file)
--- a/cinelerra-5.1/cinelerra/assetpopup.h
+++ b/cinelerra-5.1/cinelerra/assetpopup.h
@@ -54,7 +54,8 @@ public:
        AssetPopupBuildIndex *index;
        AssetPopupView *view;
        AssetPopupViewWindow *view_window;
-       AssetPopupMixer *mixer;
+       AssetPopupOpenMixer *open_mixer;
+       AssetPopupInsertMixer *insert_mixer;
        AWindowListFormat *format;
 };
 
@@ -121,11 +122,23 @@ public:
        AssetPopup *popup;
 };
 
-class AssetPopupMixer : public BC_MenuItem
+class AssetPopupOpenMixer : public BC_MenuItem
 {
 public:
-       AssetPopupMixer(MWindow *mwindow, AssetPopup *popup);
-       ~AssetPopupMixer();
+       AssetPopupOpenMixer(MWindow *mwindow, AssetPopup *popup);
+       ~AssetPopupOpenMixer();
+
+       int handle_event();
+
+       MWindow *mwindow;
+       AssetPopup *popup;
+};
+
+class AssetPopupInsertMixer : public BC_MenuItem
+{
+public:
+       AssetPopupInsertMixer(MWindow *mwindow, AssetPopup *popup);
+       ~AssetPopupInsertMixer();
 
        int handle_event();
 
@@ -217,6 +230,7 @@ public:
        AWindowListFormat *format;
        AssetSnapshot *asset_snapshot;
        AssetGrabshot *asset_grabshot;
+       AssetSelectUsed *select_used;
        int shots_displayed;
 };