X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fawindowgui.h;h=dadc44bc440576d4ec0ab54931968149c02015fb;hp=99db0753ceaa9e0f7eec56c016a9c73e68b574d3;hb=f4cba337b328ed1842085076c3e2c8244e3a94bd;hpb=debf38f78ae5ce154f54183b1638278bf8a24736

diff --git a/cinelerra-5.1/cinelerra/awindowgui.h b/cinelerra-5.1/cinelerra/awindowgui.h
index 99db0753..dadc44bc 100644
--- a/cinelerra-5.1/cinelerra/awindowgui.h
+++ b/cinelerra-5.1/cinelerra/awindowgui.h
@@ -44,6 +44,7 @@
 #include "mwindow.inc"
 #include "mutex.inc"
 #include "pluginserver.inc"
+#include "preferences.inc"
 #include "proxypopup.inc"
 #include "renderengine.inc"
 #include "samples.inc"
@@ -57,8 +58,11 @@
 // in percent view_h
 #define VIEW_POPUP_BAR_H 15
 
-#define ASSET_DRAW_IMAGE 0
-#define ASSET_DRAW_MEDIA_MAP 1
+#define ASSET_VIEW_NONE 0
+#define ASSET_VIEW_ICON 1
+#define ASSET_VIEW_MEDIA 2
+#define ASSET_VIEW_MEDIA_MAP 3
+#define ASSET_VIEW_FULL 4
 
 class AWindowFolderItem : public BC_ListBoxItem
 {
@@ -169,12 +173,13 @@ class AssetViewPopup : public ViewPopup
 {
 public:
 	AssetViewPopup(VIconThread *vt, int draw_mode,
-		VFrame *frame, int x, int y, int w, int h);
+			int x, int y, int w, int h);
 	~AssetViewPopup();
 
 	int button_press_event();
 	int button_release_event();
 	int cursor_motion_event();
+	int keypress_event();
 
 	void draw_vframe(VFrame *frame);
 
@@ -186,13 +191,19 @@ public:
 class AssetVIconThread : public VIconThread
 {
 public:
-	AssetVIconThread(AWindowAssets *asset_list);
+	AssetVIconThread(AWindowGUI *gui, Preferences *preferences);
 	~AssetVIconThread();
 
-	void set_view_popup(AssetVIcon *vicon, int draw_mode=-1);
-	ViewPopup *new_view_window(VFrame *frame);
+	void set_view_popup(AssetVIcon *v, int draw_mode=-1);
+	ViewPopup *new_view_window();
+	void drawing_started();
+	void drawing_stopped();
+	void close_view_popup();
 
+	AWindowGUI *gui;
 	int draw_mode;
+	int vicon_cmodel;
+	Mutex *draw_lock;
 };
 
 
@@ -266,6 +277,7 @@ public:
 	int load_defaults(BC_Hash *defaults);
 	void start_vicon_drawing();
 	void stop_vicon_drawing();
+	void close_view_popup();
 	void update_picon(Indexable *indexable);
 	int cycle_assetlist_format();