X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.h;h=6eb384cec586e71c38afed90a7e20c0767f1f515;hb=0c4a2483761f458447fc3fa451bf1271caa75df5;hp=0331d5c6282a4d6cd51439ae7387a404db6df1d8;hpb=4a6b59824b2db18e6cc49b43a971923d5e5903ae;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/mwindow.h b/cinelerra-5.1/cinelerra/mwindow.h
index 0331d5c6..6eb384ce 100644
--- a/cinelerra-5.1/cinelerra/mwindow.h
+++ b/cinelerra-5.1/cinelerra/mwindow.h
@@ -88,7 +88,6 @@
 #include "thread.h"
 #include "threadloader.inc"
 #include "timebar.inc"
-#include "timebomb.h"
 #include "tipwindow.inc"
 #include "track.inc"
 #include "tracking.inc"
@@ -115,6 +114,7 @@ public:
 	void create_objects(int want_gui,
 		int want_new,
 		char *config_path);
+	int uses_opengl();
 	void show_splash();
 	void hide_splash();
 	void start();
@@ -183,10 +183,6 @@ public:
 	void update_vwindow();
 // Fit selected time to horizontal display range
 	void fit_selection();
-	EDL *selected_edits_to_clip(int packed,
-		double *start_position, Track **start_track,
-		int edit_labels, int edit_autos, int edit_plugins);
-	void selected_edits_to_clipboard(int packed);
 // Fit selected autos to the vertical display range
 	void fit_autos(int all);
 	void change_currentautorange(int autogrouptype, int increment, int changemax);
@@ -215,8 +211,8 @@ public:
 
 	void handle_mixers(EDL *edl, int command, int wait_tracking,
 		int use_inout, int toggle_audio, int loop_play, float speed);
-	ZWindow *create_mixer(Indexable *indexable);
-	void create_mixers();
+	ZWindow *create_mixer(Indexable *indexable, double position);
+	void create_mixers(double position = 0);
 	void refresh_mixers(int dir=1);
 	void stop_mixers();
 	void close_mixers(int destroy=1);
@@ -289,7 +285,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();
@@ -351,6 +347,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();
@@ -369,7 +368,6 @@ public:
 // Calculate defaults path
 	static void create_defaults_path(char *string, const char *config_file);
 
-	void delete_track();
 	void delete_track(Track *track);
 	void delete_tracks();
 	int feather_edits(int64_t feather_samples, int audio, int video);
@@ -409,8 +407,7 @@ public:
 // Move edit to new position
 	void move_edits(ArrayList<Edit*> *edits, Track *track, double position,
 		int mode); // mode: 0 - mute and overwrite,  1 - cut and paste
-	void paste_edits(EDL *clip, Track *first_track, double position, int overwrite,
-		int edit_edits, int edit_labels, int edit_autos, int edit_plugins);
+	void selected_edits_to_clipboard(int packed);
 	void paste_clipboard(Track *first_track, double position, int overwrite,
 		int edit_edits, int edit_labels, int edit_autos, int edit_plugins);
 	void move_group(EDL *group, Track *first_track, double position, int overwrite);
@@ -478,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);
 
@@ -524,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();
@@ -585,7 +582,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();