X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fawindowgui.h;h=b941e18da58d0428605c8edc8b1f0cefa9f25eaf;hp=165e201f60a26af2ed5af0657b87a98b4afcb3b4;hb=540f653df26e5e2d1249de1f7a1a3d888dddf341;hpb=faf9f1da60357505e88f5be80c0256a64bf2d650 diff --git a/cinelerra-5.1/cinelerra/awindowgui.h b/cinelerra-5.1/cinelerra/awindowgui.h index 165e201f..b941e18d 100644 --- a/cinelerra-5.1/cinelerra/awindowgui.h +++ b/cinelerra-5.1/cinelerra/awindowgui.h @@ -27,6 +27,7 @@ #include "assetpopup.inc" #include "asset.inc" #include "assets.inc" +#include "audiodevice.inc" #include "awindow.inc" #include "awindowgui.inc" #include "clippopup.inc" @@ -39,8 +40,12 @@ #include "labels.h" #include "indexable.inc" #include "mwindow.inc" +#include "mutex.inc" #include "newfolder.inc" #include "pluginserver.inc" +#include "proxypopup.inc" +#include "renderengine.inc" +#include "samples.inc" #include "vicon.h" class AssetPicon : public BC_ListBoxItem @@ -50,12 +55,18 @@ public: AssetPicon(MWindow *mwindow, AWindowGUI *gui, EDL *edl); AssetPicon(MWindow *mwindow, AWindowGUI *gui, PluginServer *plugin); AssetPicon(MWindow *mwindow, AWindowGUI *gui, Label *plugin); - AssetPicon(MWindow *mwindow, AWindowGUI *gui, int folder); - AssetPicon(MWindow *mwindow, AWindowGUI *gui, const char *folder_name, int folder_num); + AssetPicon(MWindow *mwindow, AWindowGUI *gui, int folder, int persist); 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); MWindow *mwindow; AWindowGUI *gui; @@ -72,12 +83,32 @@ public: EDL *edl; int in_use; - + time_t mtime; int persistent; 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 { @@ -90,6 +121,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(); @@ -139,14 +173,16 @@ public: int keypress_event(); void async_update_assets(); // Sends update asset event void update_effects(); - void sort_assets(); + void sort_assets(int use_mtime); + 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, @@ -155,7 +191,7 @@ public: void create_label_folder(); void copy_picons(ArrayList *dst, ArrayList *src, int folder); - void sort_picons(ArrayList *src); + void sort_picons(ArrayList *src, int use_mtime=0); // Return the selected asset in asset_list Indexable* selected_asset(); PluginServer* selected_plugin(); @@ -167,12 +203,20 @@ public: void stop_vicon_drawing(); void update_picon(Indexable *indexable); + VFrame *get_picon(const char *name, const char *plugin_icons); + VFrame *get_picon(const char *name); + void resource_icon(VFrame *&vfrm, BC_Pixmap *&icon, const char *fn, int idx); + void theme_icon(VFrame *&vfrm, BC_Pixmap *&icon, const char *fn); + void plugin_icon(VFrame *&vfrm, BC_Pixmap *&icon, const char *fn, unsigned char *png); + MWindow *mwindow; AWindow *awindow; AWindowAssets *asset_list; AWindowFolders *folder_list; AWindowDivider *divider; + AWindowSearchText *search_text; + Mutex *folder_lock; // Store data to speed up responses // Persistant data for listboxes @@ -193,34 +237,48 @@ public: BC_Hash *defaults; // Persistent icons - BC_Pixmap *folder_icon; - BC_Pixmap *file_icon; - BC_Pixmap *audio_icon; - BC_Pixmap *video_icon; - BC_Pixmap *label_icon; + BC_Pixmap *aeffect_folder_icon; VFrame *aeffect_folder_vframe; + BC_Pixmap *atransition_folder_icon; VFrame *atransition_folder_vframe; + BC_Pixmap *clip_folder_icon; VFrame *clip_folder_vframe; + BC_Pixmap *label_folder_icon; VFrame *label_folder_vframe; + BC_Pixmap *media_folder_icon; VFrame *media_folder_vframe; + BC_Pixmap *proxy_folder_icon; VFrame *proxy_folder_vframe; + BC_Pixmap *veffect_folder_icon; VFrame *veffect_folder_vframe; + BC_Pixmap *vtransition_folder_icon; VFrame *vtransition_folder_vframe; + BC_Pixmap *folder_icons[AWINDOW_FOLDERS]; + + BC_Pixmap *folder_icon; VFrame *folder_vframe; + BC_Pixmap *file_icon; VFrame *file_vframe; + BC_Pixmap *audio_icon; VFrame *audio_vframe; + BC_Pixmap *video_icon; VFrame *video_vframe; + BC_Pixmap *label_icon; VFrame *label_vframe; BC_Pixmap *clip_icon; VFrame *clip_vframe; BC_Pixmap *atransition_icon; VFrame *atransition_vframe; BC_Pixmap *vtransition_icon; VFrame *vtransition_vframe; BC_Pixmap *aeffect_icon; VFrame *aeffect_vframe; + BC_Pixmap *veffect_icon; VFrame *veffect_vframe; BC_Pixmap *ladspa_icon; VFrame *ladspa_vframe; BC_Pixmap *ff_aud_icon; VFrame *ff_aud_vframe; BC_Pixmap *ff_vid_icon; VFrame *ff_vid_vframe; - BC_Pixmap *veffect_icon; VFrame *veffect_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; @@ -292,6 +350,35 @@ public: AWindowGUI *gui; }; +class AWindowSearchTextBox : public BC_TextBox +{ +public: + AWindowSearchTextBox(AWindowSearchText *search_text, int x, int y, int w); + int handle_event(); + + AWindowSearchText *search_text; +}; + +class AWindowSearchText +{ +public: + AWindowSearchText(MWindow *mwindow, AWindowGUI *gui, int x, int y); + + int handle_event(); + void create_objects(); + int get_w(); + int get_h(); + void reposition_window(int x, int y, int w); + const char *get_text(); + void clear(); + + MWindow *mwindow; + AWindowGUI *gui; + int x, y; + BC_Title *text_title; + BC_TextBox *text_box; +}; + class AWindowNewFolder : public BC_Button { public: