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=d135145555cd4bb8552cea543ff19d37d20ea4ea;hb=001bb253486a6e28db4a9a82a12b278d38f4c9de;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1

diff --git a/cinelerra-5.1/cinelerra/awindowgui.h b/cinelerra-5.1/cinelerra/awindowgui.h
index d1351455..dadc44bc 100644
--- a/cinelerra-5.1/cinelerra/awindowgui.h
+++ b/cinelerra-5.1/cinelerra/awindowgui.h
@@ -35,6 +35,7 @@
 #include "edl.inc"
 #include "effectlist.inc"
 #include "folderlistmenu.inc"
+#include "garbage.h"
 #include "guicast.h"
 #include "labeledit.inc"
 #include "labelpopup.inc"
@@ -43,11 +44,26 @@
 #include "mwindow.inc"
 #include "mutex.inc"
 #include "pluginserver.inc"
+#include "preferences.inc"
 #include "proxypopup.inc"
 #include "renderengine.inc"
 #include "samples.inc"
 #include "vicon.h"
 
+#define SELECT_ALL 0
+#define SELECT_USED 1
+#define SELECT_UNUSED 2
+#define SELECT_NONE 3
+
+// in percent view_h
+#define VIEW_POPUP_BAR_H 15
+
+#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
 {
 public:
@@ -76,7 +92,12 @@ public:
 	void reset();
 	static void draw_hue_bar(VFrame *frame, double t);
 	static void draw_wave(VFrame *frame, double *dp, int len,
-		int base_color, int line_color);
+		int base_color, int line_color, int x, int y, int w, int h);
+	static void draw_wave(VFrame *frame, double *dp, int len,
+		int base_color, int line_color, int x=0, int y=0) {
+	  draw_wave(frame, dp, len, base_color, line_color,
+		x,y,frame->get_w(),frame->get_h());
+	}
 	void open_render_engine(EDL *edl, int is_audio);
 	void close_render_engine();
 	void render_video(int64_t pos, VFrame *vfrm);
@@ -107,7 +128,7 @@ public:
 	double sort_key;
 	PluginServer *plugin;
 	Label *label;
-	VIcon *vicon;
+	AssetVIcon *vicon;
 	RenderEngine *render_engine;
 };
 
@@ -130,7 +151,7 @@ public:
 	int audio_pos;
 };
 
-class AssetVIcon : public VIcon {
+class AssetVIcon : public VIcon, public Garbage {
 public:
 	AssetPicon *picon;
 	VFrame *temp;
@@ -148,6 +169,44 @@ public:
 	~AssetVIcon();
 };
 
+class AssetViewPopup : public ViewPopup
+{
+public:
+	AssetViewPopup(VIconThread *vt, int draw_mode,
+			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);
+
+	int bar_h;
+	int draw_mode;
+	int dragging;
+};
+
+class AssetVIconThread : public VIconThread
+{
+public:
+	AssetVIconThread(AWindowGUI *gui, Preferences *preferences);
+	~AssetVIconThread();
+
+	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;
+};
+
+
 class AWindowRemovePlugin;
 
 class AWindowRemovePluginGUI : public BC_Window {
@@ -218,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();
 
@@ -293,14 +353,15 @@ public:
 	AddTools *add_tools;
 // Temporary for reading picons from files
 	VFrame *temp_picon;
-	VIconThread *vicon_thread;
+	AssetVIconThread *vicon_thread;
 	AssetVIconAudio *vicon_audio;
 
 	int64_t plugin_visibility;
 	AWindowRemovePlugin *remove_plugin;
 
 	AVIconDrawing *avicon_drawing;
-	int avicon_w, avicon_h, vicon_drawing;
+	int avicon_w, avicon_h;
+	int vicon_drawing;
 	int allow_iconlisting;
 
 // Create custom atoms to be used for async messages between windows
@@ -336,8 +397,6 @@ public:
 	int column_resize_event();
 	int focus_in_event();
 	int focus_out_event();
-	int cursor_enter_event();
-	int cursor_leave_event();
 	void update_vicon_area();
 	int mouse_over_event(int no);
 
@@ -547,4 +606,23 @@ public:
 	AWindowGUI *gui;
 };
 
+class AssetSelectUsedItem : public BC_MenuItem
+{
+public:
+	AssetSelectUsedItem(AssetSelectUsed *select_used, const char *text, int action);
+	int handle_event();
+
+	int action;
+	AssetSelectUsed *select_used;
+};
+
+class AssetSelectUsed : public BC_MenuItem
+{
+public:
+	AssetSelectUsed(MWindow *mwindow, AWindowGUI *gui);
+
+	MWindow *mwindow;
+	AWindowGUI *gui;
+};
+
 #endif