vicon drag tweaks, proxy drag fix, vicon mouseover, binfolder around sort fix, draw_r...

[goodguy/history.git] / cinelerra-5.1 / cinelerra / awindowgui.h

diff --git a/cinelerra-5.1/cinelerra/awindowgui.h b/cinelerra-5.1/cinelerra/awindowgui.h
index 440b4019c41df7bf804b2a891c8a15f1db741fd6..c26d4e87dc2e809a124e7fc23c4040c58fc4b6ea 100644 (file)
--- 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,7 +41,7 @@
 #include "labels.h"
 #include "indexable.inc"
 #include "mwindow.inc"
-#include "newfolder.inc"
+#include "mutex.inc"
 #include "pluginserver.inc"
 #include "proxypopup.inc"
 #include "renderengine.inc"
@@ -55,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();
@@ -66,11 +68,13 @@ public:
        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;
@@ -82,9 +86,9 @@ public:
        EDL *edl;
 
        int in_use;
-       time_t mtime;
-
        int persistent;
+       time_t comments_time;
+       double sort_key;
        PluginServer *plugin;
        Label *label;
        VIcon *vicon;
@@ -172,10 +176,9 @@ 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();
@@ -190,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();
@@ -201,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);
@@ -215,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
@@ -259,8 +264,6 @@ 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;
@@ -287,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();
@@ -316,6 +321,10 @@ 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);
 
        MWindow *mwindow;
        AWindowGUI *gui;
@@ -343,6 +352,7 @@ public:
 
        int selection_changed();
        int button_press_event();
+       int drag_stop();
 
        MWindow *mwindow;
        AWindowGUI *gui;
@@ -377,36 +387,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: