X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fawindowgui.h;h=04d834609bcd33c19f07d151d79e1e02f59e2b9e;hb=0e00daab15d8b871ec7f76c2713b75d5f3fb237d;hp=2e9228694b73fb2d62aa538e6e0f70ce74d1e7c4;hpb=38cb4182e11e57fc426bede3825e825e9d61433b;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/awindowgui.h b/cinelerra-5.1/cinelerra/awindowgui.h
index 2e922869..04d83460 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"
@@ -41,6 +42,8 @@
 #include "mwindow.inc"
 #include "newfolder.inc"
 #include "pluginserver.inc"
+#include "renderengine.inc"
+#include "samples.inc"
 #include "vicon.h"
 
 class AssetPicon : public BC_ListBoxItem
@@ -55,6 +58,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;
@@ -71,12 +81,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 {
@@ -89,6 +119,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();
@@ -138,7 +171,7 @@ 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);
@@ -155,7 +188,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);
+	void sort_picons(ArrayList<BC_ListBoxItem*> *src, int use_mtime=0);
 // Return the selected asset in asset_list
 	Indexable* selected_asset();
 	PluginServer* selected_plugin();
@@ -239,6 +272,7 @@ public:
 // Temporary for reading picons from files
 	VFrame *temp_picon;
 	VIconThread *vicon_thread;
+	AssetVIconAudio *vicon_audio;
 
 	int64_t plugin_visibility;
 	AWindowRemovePlugin *remove_plugin;