X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fawindowgui.h;h=c26d4e87dc2e809a124e7fc23c4040c58fc4b6ea;hp=2e9228694b73fb2d62aa538e6e0f70ce74d1e7c4;hb=17b4e5a06157865391c2d07b552b81d84665bcae;hpb=38cb4182e11e57fc426bede3825e825e9d61433b diff --git a/cinelerra-5.1/cinelerra/awindowgui.h b/cinelerra-5.1/cinelerra/awindowgui.h index 2e922869..c26d4e87 100644 --- a/cinelerra-5.1/cinelerra/awindowgui.h +++ b/cinelerra-5.1/cinelerra/awindowgui.h @@ -24,9 +24,11 @@ #include "arraylist.h" #include "bcdialog.h" +#include "binfolder.inc" #include "assetpopup.inc" #include "asset.inc" #include "assets.inc" +#include "audiodevice.inc" #include "awindow.inc" #include "awindowgui.inc" #include "clippopup.inc" @@ -39,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 @@ -51,15 +56,25 @@ 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(); 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); + 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; @@ -71,12 +86,32 @@ public: EDL *edl; int in_use; - - int persistent; + time_t comments_time; + double sort_key; PluginServer *plugin; Label *label; VIcon *vicon; + RenderEngine *render_engine; +}; + +typedef int16_t vicon_audio_t; + +class AssetVIconAudio : public Thread +{ +public: + AssetVIconAudio(AWindowGUI *gui); + ~AssetVIconAudio(); + + void run(); + void start(AssetVIcon *vicon); + void stop(int wait); + + AWindowGUI *gui; + AudioDevice *audio; + AssetVIcon *vicon; + int interrupted; + int audio_pos; }; class AssetVIcon : public VIcon { @@ -89,6 +124,9 @@ public: int64_t set_seq_no(int64_t no); int get_vx(); int get_vy(); + void load_audio(); + void start_audio(); + void stop_audio(); AssetVIcon(AssetPicon *picon, int w, int h, double framerate, int64_t length); ~AssetVIcon(); @@ -141,12 +179,12 @@ public: 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(); + void collect_assets(int proxy=0); + EDL *collect_proxy(Indexable *indexable); void create_persistent_folder(ArrayList *output, int do_audio, int do_video, @@ -166,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); @@ -180,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 @@ -224,21 +264,22 @@ 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 VFrame *temp_picon; VIconThread *vicon_thread; + AssetVIconAudio *vicon_audio; int64_t plugin_visibility; AWindowRemovePlugin *remove_plugin; @@ -249,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(); @@ -278,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; @@ -305,6 +352,7 @@ public: int selection_changed(); int button_press_event(); + int drag_stop(); MWindow *mwindow; AWindowGUI *gui; @@ -339,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: