X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fawindowgui.h;h=b52add9b2059f84f668084644b7456ecd3c52410;hb=166867a58d74619aa11aeb562a994cc364d62231;hp=35fdb9231c796a80ea5b5fd9e0e62d3fd41dc21f;hpb=e8453fdab4d5ed7b384279a5b37c92010ac13295;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/awindowgui.h b/cinelerra-5.1/cinelerra/awindowgui.h
index 35fdb923..b52add9b 100644
--- a/cinelerra-5.1/cinelerra/awindowgui.h
+++ b/cinelerra-5.1/cinelerra/awindowgui.h
@@ -131,6 +131,9 @@ public:
 	int in_use;
 	int persistent;
 	time_t comments_time;
+	int comments_ffmt;
+	double comments_rate;
+	const char *comments_type;
 	double sort_key;
 	PluginServer *plugin;
 	Label *label;
@@ -162,6 +165,7 @@ public:
 	AssetPicon *picon;
 	VFrame *temp;
 	int64_t length;
+	int broken;
 
 	VFrame *frame();
 	int64_t set_seq_no(int64_t no);
@@ -182,6 +186,7 @@ public:
 			int x, int y, int w, int h);
 	~AssetViewPopup();
 
+	int reposition_window(int x, int y, int w, int h);
 	int button_press_event();
 	int button_release_event();
 	int cursor_motion_event();
@@ -202,15 +207,12 @@ public:
 
 	void set_view_popup(AssetVIcon *v, int draw_mode);
 	void set_view_popup(AssetVIcon *v);
-	ViewPopup *new_view_window();
-	void drawing_started();
-	void drawing_stopped();
-	void close_view_popup();
+	ViewPopup *new_view_window(ViewPopup *popup);
+	void stop_vicon_drawing(int wait=0);
 
 	AWindowGUI *gui;
 	int draw_mode;
 	int vicon_cmodel;
-	Mutex *draw_lock;
 };
 
 
@@ -266,7 +268,7 @@ public:
 	int drag_stop();
 // Collect items into the drag vectors of MainSession
 	void collect_assets(int proxy=0);
-	EDL *collect_proxy(Indexable *indexable);
+	EDL *collect_proxy(Asset *asset);
 	void create_persistent_folder(ArrayList<BC_ListBoxItem*> *output,
 		int do_audio,
 		int do_video,
@@ -282,11 +284,11 @@ public:
 	bool protected_pixmap(BC_Pixmap *pixmap);
 	int save_defaults(BC_Hash *defaults);
 	int load_defaults(BC_Hash *defaults);
-	void start_vicon_drawing();
-	int stop_vicon_drawing();
-	void close_view_popup();
+	int start_vicon_drawing();
+	int stop_vicon_drawing(int wait=0);
 	void update_picon(Indexable *indexable);
 	int cycle_assetlist_format();
+	void hide_tip_info();
 
 	VFrame *get_picon(const char *name, const char *plugin_icons);
 	VFrame *get_picon(const char *name);
@@ -368,8 +370,9 @@ public:
 
 	AVIconDrawing *avicon_drawing;
 	int avicon_w, avicon_h;
-	int vicon_drawing;
+	int vicon_drawing, play_off;
 	int allow_iconlisting;
+	int tip_info;
 
 // Create custom atoms to be used for async messages between windows
 	int create_custom_xatoms();
@@ -402,13 +405,17 @@ public:
 	int drag_stop_event();
 	int button_press_event();
 	int column_resize_event();
-	int focus_in_event();
+	int cursor_enter_event();
+	int cursor_leave_event();
 	int focus_out_event();
 	void update_vicon_area();
 	int mouse_over_event(int no);
+	void show_tip_info(const char *info, int no);
+	void hide_tip_info();
 
 	MWindow *mwindow;
 	AWindowGUI *gui;
+	int info_tip;
 };
 
 class AWindowDivider : public BC_SubWindow
@@ -593,8 +600,10 @@ public:
 	AVIconDrawing(AWindowGUI *agui, int x, int y, int w, const char *text);
 	~AVIconDrawing();
 
-	void create_objects();
 	static const char *avicon_names[];
+	void create_objects();
+	int button_press_event();
+	int draw_face(int dx, int color);
 
 	AWindowGUI *agui;
 };