X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.h;h=0e6db95ec52ee2dd6489cc674838e20284e451dc;hp=3256ace624402e1d4d964ae2fbbaefb6259568c2;hb=03fa86e6dc495f9444ae14dad401b1ad6de793fe;hpb=aa9374b902768107ebda0cffe739325ffed372f6

diff --git a/cinelerra-5.1/cinelerra/mwindow.h b/cinelerra-5.1/cinelerra/mwindow.h
index 3256ace6..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"
@@ -88,7 +89,6 @@
 #include "thread.h"
 #include "threadloader.inc"
 #include "timebar.inc"
-#include "timebomb.h"
 #include "tipwindow.inc"
 #include "track.inc"
 #include "tracking.inc"
@@ -286,7 +286,7 @@ public:
 	int zoom_in_t();
 	void split_x();
 	void split_y();
-	void crop_video();
+	void crop_video(int mode);
 	void update_plugins();
 // Call after every edit operation
 	void save_backup();
@@ -348,6 +348,9 @@ public:
 	void clear(int clear_handle);
 	void clear_labels();
 	int clear_labels(double start, double end);
+	void clear_hard_edges();
+	int clear_hard_edges(double start, double end);
+	void clear_select();
 	void concatenate_tracks();
 	int copy_flags(int copy_flags=COPY_CLIPBOARD);
 	void copy();
@@ -463,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();
@@ -473,6 +475,7 @@ public:
 	void set_automation_mode(int mode);
 	void set_keyframe_type(int mode);
 	void set_auto_keyframes(int value);
+	void set_span_keyframes(int value);
 	void set_auto_visibility(Autos *autos, int value);
 	void set_labels_follow_edits(int value);
 
@@ -519,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();
@@ -540,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
@@ -580,7 +587,6 @@ public:
 	ArrayList<ColormodelItem*> colormodels;
 	ArrayList<InterlacemodeItem*>          interlace_project_modes;
 	ArrayList<InterlacemodeItem*>          interlace_asset_modes;
-	ArrayList<InterlacefixmethodItem*>     interlace_asset_fixmethods;
 
 	int reset_meters();
 	void resync_guis();
@@ -598,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