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=3068ac99f00eb79164541d55807074fca08740d5;hb=540f653df26e5e2d1249de1f7a1a3d888dddf341;hpb=a6369311556cc1e1877142181d8606e4f68aa803

diff --git a/cinelerra-5.1/cinelerra/awindowgui.h b/cinelerra-5.1/cinelerra/awindowgui.h
index 3068ac99..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
@@ -55,6 +60,13 @@ public:
 
 	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;
@@ -77,6 +89,26 @@ public:
 	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 +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();
@@ -146,7 +181,8 @@ public:
 	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<BC_ListBoxItem*> *output,
 		int do_audio,
 		int do_video,
@@ -180,6 +216,7 @@ public:
 	AWindowFolders *folder_list;
 	AWindowDivider *divider;
 	AWindowSearchText *search_text;
+	Mutex *folder_lock;
 
 // Store data to speed up responses
 // Persistant data for listboxes
@@ -230,15 +267,18 @@ public:
 	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;