X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.h;h=0e6db95ec52ee2dd6489cc674838e20284e451dc;hb=120f82197b4bdfdad9a5a666d773b45a8064d049;hp=6083242d37ac8a235996d729670d02de6d9d1505;hpb=33aae273918725085d841a8af927bfccd2aa9364;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/mwindow.h b/cinelerra-5.1/cinelerra/mwindow.h
index 6083242d..0e6db95e 100644
--- a/cinelerra-5.1/cinelerra/mwindow.h
+++ b/cinelerra-5.1/cinelerra/mwindow.h
@@ -39,6 +39,7 @@
 #include "channel.inc"
 #include "channeldb.inc"
 #include "commercials.inc"
+#include "convert.inc"
 #include "cwindow.inc"
 #include "bchash.inc"
 #include "devicedvbinput.inc"
@@ -465,8 +466,7 @@ public:
 // Asset removal from caches
 	void reset_caches();
 	void remove_asset_from_caches(Asset *asset);
-	void remove_assets_from_project(int push_undo /* = 0 */,
-		int redraw /* 1 */,
+	void remove_assets_from_project(int push_undo, int redraw, int delete_indexes,
 		ArrayList<Indexable*> *drag_assets /* mwindow->session->drag_assets */,
 		ArrayList<EDL*> *drag_clips /* mwindow->session->drag_clips */);
 	void remove_assets_from_disk();
@@ -522,9 +522,8 @@ public:
 	int modify_pluginhandles();
 	void finish_modify_handles();
 	void rescale_proxy(EDL *clip, int orig_scale, int new_scale);
-	void add_proxy(int use_scaler,
-		ArrayList<Indexable*> *orig_assets,
-		ArrayList<Indexable*> *proxy_assets);
+	void add_proxy(ArrayList<Indexable*> *orig_assets,
+			ArrayList<Indexable*> *proxy_assets);
 	int render_proxy(ArrayList<Indexable *> &new_idxbls);
 	void beep(double freq, double secs, double gain);
 	int enable_proxy();
@@ -543,6 +542,11 @@ public:
 // Send new EDL to caches
 	void age_caches();
 	int optimize_assets();            // delete unused assets from the cache and assets
+// render edl assets to specified format, then replace in edl
+	void start_convert(Asset *format_asset, const char *suffix,
+			float beep, int remove_originals);
+	void finish_convert(int remove_originals);
+	ConvertRender *convert_render;
 
 	void select_point(double position);
 	int set_loop_boundaries();         // toggle loop playback and set boundaries for loop playback
@@ -600,7 +604,7 @@ public:
 	static ArrayList<PluginServer*> *plugindb;
 // Currently visible plugins
 	int64_t plugin_visibility;
-	ArrayList<PluginServer*> *plugin_guis;
+	PluginGUIs *plugin_guis;
 // GUI Plugins to delete
 	ArrayList<PluginServer*> *dead_plugins;
 // Keyframe editors