X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fawindowgui.h;h=6aade3ca6925d03a09e8b199ae0dfe165decb221;hp=703c976422e535c81acb3727989ca6b88d49381e;hb=21eb2e0b479adf7bf846b835e5c7d9613b6f1a6d;hpb=418e8644335db47143bc421f11be2c2e68901d45

diff --git a/cinelerra-5.1/cinelerra/awindowgui.h b/cinelerra-5.1/cinelerra/awindowgui.h
index 703c9764..6aade3ca 100644
--- a/cinelerra-5.1/cinelerra/awindowgui.h
+++ b/cinelerra-5.1/cinelerra/awindowgui.h
@@ -24,6 +24,7 @@
 
 #include "arraylist.h"
 #include "bcdialog.h"
+#include "binfolder.inc"
 #include "assetpopup.inc"
 #include "asset.inc"
 #include "assets.inc"
@@ -40,8 +41,11 @@
 #include "labels.h"
 #include "indexable.inc"
 #include "mwindow.inc"
-#include "newfolder.inc"
+#include "mutex.inc"
 #include "pluginserver.inc"
+#include "proxypopup.inc"
+#include "renderengine.inc"
+#include "samples.inc"
 #include "vicon.h"
 
 class AssetPicon : public BC_ListBoxItem
@@ -52,6 +56,7 @@ public:
 	AssetPicon(MWindow *mwindow, AWindowGUI *gui, PluginServer *plugin);
 	AssetPicon(MWindow *mwindow, AWindowGUI *gui, Label *plugin);
 	AssetPicon(MWindow *mwindow, AWindowGUI *gui, int folder, int persist);
+	AssetPicon(MWindow *mwindow, AWindowGUI *gui, int folder, const char *title);
 	virtual ~AssetPicon();
 
 	void create_objects();
@@ -59,11 +64,17 @@ public:
 	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);
+	void open_render_engine(EDL *edl, int is_audio);
+	void close_render_engine();
+	void render_video(int64_t pos, VFrame *vfrm);
+	void render_audio(int64_t pos, Samples **samples, int len);
+	VFrame *get_vicon_frame();
 
 	MWindow *mwindow;
 	AWindowGUI *gui;
 	BC_Pixmap *icon;
 	VFrame *icon_vframe;
+	VFrame *vicon_frame;
 	int foldernum;
 // ID of thing pointed to
 	int id;
@@ -75,12 +86,13 @@ public:
 	EDL *edl;
 
 	int in_use;
-	time_t mtime;
-
 	int persistent;
+	time_t comments_time;
+	double sort_key;
 	PluginServer *plugin;
 	Label *label;
 	VIcon *vicon;
+	RenderEngine *render_engine;
 };
 
 typedef int16_t vicon_audio_t;
@@ -164,15 +176,15 @@ public:
 	int keypress_event();
 	void async_update_assets();     // Sends update asset event
 	void update_effects();
-	void sort_assets(int use_mtime);
+	void sort_assets();
 	void sort_folders();
 	void reposition_objects();
-	static int folder_number(const char *name);
 // Call back for MWindow entry point
 	int drag_motion();
 	int drag_stop();
 // Collect items into the drag vectors of MainSession
 	void collect_assets();
+	EDL *collect_proxy(Indexable *indexable);
 	void create_persistent_folder(ArrayList<BC_ListBoxItem*> *output,
 		int do_audio,
 		int do_video,
@@ -181,7 +193,7 @@ public:
 	void create_label_folder();
 	void copy_picons(ArrayList<BC_ListBoxItem*> *dst,
 		ArrayList<BC_ListBoxItem*> *src, int folder);
-	void sort_picons(ArrayList<BC_ListBoxItem*> *src, int use_mtime=0);
+	void sort_picons(ArrayList<BC_ListBoxItem*> *src);
 // Return the selected asset in asset_list
 	Indexable* selected_asset();
 	PluginServer* selected_plugin();
@@ -192,6 +204,7 @@ public:
 	void start_vicon_drawing();
 	void stop_vicon_drawing();
 	void update_picon(Indexable *indexable);
+	int cycle_assetlist_format();
 
 	VFrame *get_picon(const char *name, const char *plugin_icons);
 	VFrame *get_picon(const char *name);
@@ -206,6 +219,7 @@ public:
 	AWindowFolders *folder_list;
 	AWindowDivider *divider;
 	AWindowSearchText *search_text;
+	Mutex *folder_lock;
 
 // Store data to speed up responses
 // Persistant data for listboxes
@@ -250,16 +264,16 @@ public:
 	BC_Pixmap *ff_aud_icon;       VFrame *ff_aud_vframe;
 	BC_Pixmap *ff_vid_icon;       VFrame *ff_vid_vframe;
 
-	NewFolderThread *newfolder_thread;
-
 // Popup menus
 	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
@@ -276,9 +290,11 @@ public:
 
 // Create custom atoms to be used for async messages between windows
 	int create_custom_xatoms();
-// Function to overload to recieve customly defined atoms
-	virtual int recieve_custom_xatoms(xatom_event *event);
+// Function to overload to receive customly defined atoms
+	virtual int receive_custom_xatoms(xatom_event *event);
 	static const char *folder_names[];
+	NewFolderThread *new_folder_thread;
+	ModifyFolderThread *modify_folder_thread;
 
 private:
 	void update_folder_list();
@@ -305,6 +321,7 @@ public:
 	int column_resize_event();
 	int focus_in_event();
 	int focus_out_event();
+	void update_vicon_area();
 
 	MWindow *mwindow;
 	AWindowGUI *gui;
@@ -332,6 +349,7 @@ public:
 
 	int selection_changed();
 	int button_press_event();
+	int drag_stop();
 
 	MWindow *mwindow;
 	AWindowGUI *gui;
@@ -366,36 +384,6 @@ public:
 	BC_TextBox *text_box;
 };
 
-class AWindowNewFolder : public BC_Button
-{
-public:
-	AWindowNewFolder(MWindow *mwindow, AWindowGUI *gui, int x, int y);
-	int handle_event();
-	MWindow *mwindow;
-	AWindowGUI *gui;
-	int x, y;
-};
-
-class AWindowDeleteFolder : public BC_Button
-{
-public:
-	AWindowDeleteFolder(MWindow *mwindow, AWindowGUI *gui, int x, int y);
-	int handle_event();
-	MWindow *mwindow;
-	AWindowGUI *gui;
-	int x, y;
-};
-
-class AWindowRenameFolder : public BC_Button
-{
-public:
-	AWindowRenameFolder(MWindow *mwindow, AWindowGUI *gui, int x, int y);
-	int handle_event();
-	MWindow *mwindow;
-	AWindowGUI *gui;
-	int x, y;
-};
-
 class AWindowDeleteDisk : public BC_Button
 {
 public: