merged hv7 mod

[goodguy/history.git] / cinelerra-5.1 / cinelerra / awindow.h

diff --git a/cinelerra-5.1/cinelerra/awindow.h b/cinelerra-5.1/cinelerra/awindow.h
index 6b1584bdc4193c35ceebf4ad1d5433a4d7086b1c..40410b537f9a428facaf5c507f608f15fa561a9f 100644 (file)
--- a/cinelerra-5.1/cinelerra/awindow.h
+++ b/cinelerra-5.1/cinelerra/awindow.h
@@ -22,13 +22,16 @@
 #ifndef AWINDOW_H
 #define AWINDOW_H
 
+#include "arraylist.h"
 #include "assetedit.inc"
 #include "assetremove.inc"
 #include "awindowgui.inc"
 #include "bchash.inc"
 #include "bcwindowbase.inc"
 #include "clipedit.inc"
+#include "effectlist.inc"
 #include "labeledit.inc"
+#include "labelpopup.inc"
 #include "mwindow.inc"
 #include "thread.h"
 
@@ -40,6 +43,7 @@ public:
 
        void run();
        void create_objects();
+       AssetEdit *get_asset_editor();
        int load_defaults(BC_Hash *defaults);
        int save_defaults(BC_Hash *defaults);
 
@@ -47,10 +51,11 @@ public:
 
        AWindowGUI *gui;
        MWindow *mwindow;
-       AssetEdit *asset_edit;
+       ArrayList<AssetEdit*> asset_editors;
        AssetRemoveThread *asset_remove;
        ClipEdit *clip_edit;
        LabelEdit *label_edit;
+       EffectTipDialog *effect_tip;
 };
 
 #endif