X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fawindowgui.h;h=b941e18da58d0428605c8edc8b1f0cefa9f25eaf;hb=6853a2c0b04cc5ff4e87a2022c914227f925cb7f;hp=04d834609bcd33c19f07d151d79e1e02f59e2b9e;hpb=b55798fc64eee00c6fab3b4763e791befb7275f9;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/awindowgui.h b/cinelerra-5.1/cinelerra/awindowgui.h
index 04d83460..b941e18d 100644
--- a/cinelerra-5.1/cinelerra/awindowgui.h
+++ b/cinelerra-5.1/cinelerra/awindowgui.h
@@ -40,8 +40,10 @@
 #include "labels.h"
 #include "indexable.inc"
 #include "mwindow.inc"
+#include "mutex.inc"
 #include "newfolder.inc"
 #include "pluginserver.inc"
+#include "proxypopup.inc"
 #include "renderengine.inc"
 #include "samples.inc"
 #include "vicon.h"
@@ -179,7 +181,8 @@ public:
 	int drag_motion();
 	int drag_stop();
 // Collect items into the drag vectors of MainSession
-	void collect_assets();
+	void collect_assets(int proxy=0);
+	EDL *collect_proxy(Indexable *indexable);
 	void create_persistent_folder(ArrayList<BC_ListBoxItem*> *output,
 		int do_audio,
 		int do_video,
@@ -213,6 +216,7 @@ public:
 	AWindowFolders *folder_list;
 	AWindowDivider *divider;
 	AWindowSearchText *search_text;
+	Mutex *folder_lock;
 
 // Store data to speed up responses
 // Persistant data for listboxes
@@ -263,10 +267,12 @@ public:
 	AssetPopup *asset_menu;
 	ClipPopup *clip_menu;
 	LabelPopup *label_menu;
+	ProxyPopup *proxy_menu;
 	EffectListMenu *effectlist_menu;
 	AssetListMenu *assetlist_menu;
 	ClipListMenu *cliplist_menu;
 	LabelListMenu *labellist_menu;
+	ProxyListMenu *proxylist_menu;
 	FolderListMenu *folderlist_menu;
 	AddTools *add_tools;
 // Temporary for reading picons from files