X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.h;h=6a4e2fb65a1068bfd580ea6a7d069bf7f51e0f28;hb=e6b9eb867719075e4c4bb71a7bc08e11652e9062;hp=6a3dcbf17a7061a6d862012b4ecd12f9ab23be9d;hpb=84ac8a2bb3357c04a3f67cf763b0f61ddbbd021d;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/mwindow.h b/cinelerra-5.1/cinelerra/mwindow.h
index 6a3dcbf1..6a4e2fb6 100644
--- a/cinelerra-5.1/cinelerra/mwindow.h
+++ b/cinelerra-5.1/cinelerra/mwindow.h
@@ -209,7 +209,7 @@ public:
 	void media_to_clip();
 	int create_ref(Asset *asset, EDL *ref);
 // Show windows
-	void show_vwindow();
+	void show_vwindow(int raise);
 	void show_awindow();
 	void show_lwindow();
 	void show_cwindow();
@@ -265,6 +265,7 @@ public:
 // Fit selected autos to the vertical display range
 	void fit_autos(int all);
 	void change_currentautorange(int autogrouptype, int increment, int changemax);
+	void update_autorange(int type, int increment, int use_max);
 	void expand_autos(int changeall, int domin, int domax);
 	void shrink_autos(int changeall, int domin, int domax);
 // move the window to include the cursor
@@ -304,6 +305,7 @@ public:
 	void start_mixer();
 	int select_zwindow(ZWindow *zwindow);
 	void tile_mixers();
+	void tile_mixers(int x1, int x2, int y1, int y2);
 	int masters_to_mixers();
 	void mix_masters();
 	void set_gang_tracks(int v);
@@ -447,6 +449,7 @@ public:
 	void clear_hard_edges();
 	int clear_hard_edges(double start, double end);
 	void clear_select();
+	void select_edits(int v);
 	void concatenate_tracks();
 	int copy_flags(int copy_flags=COPY_CLIPBOARD);
 	void copy();
@@ -513,14 +516,14 @@ public:
 	void move_effect(Plugin *plugin, PluginSet *plugin_set, int64_t position);
 	void move_plugins_up(PluginSet *plugin_set);
 	void move_plugins_down(PluginSet *plugin_set);
+	void roll_track_down(Track *track);
+	void roll_tracks_down();
+	void roll_track_up(Track *track);
+	void roll_tracks_up();
 	void move_track_down(Track *track);
 	void move_tracks_down();
 	void move_track_up(Track *track);
 	void move_tracks_up();
-	void swap_track_down(Track *track);
-	void swap_tracks_down();
-	void swap_track_up(Track *track);
-	void swap_tracks_up();
 	void mute_selection();
 	void new_folder(const char *new_folder, int is_clips);
 	void delete_folder(char *folder);
@@ -564,7 +567,7 @@ public:
 	void remove_indexfile(Indexable *indexable);
 	void rebuild_indices();
 // Asset removal from caches
-	void reset_caches();
+	void reset_caches(int locked);
 	void remove_from_caches(Indexable *idxbl);
 	void remove_assets_from_project(int push_undo, int redraw, int delete_indexes,
 		ArrayList<Indexable*> *drag_assets /* mwindow->session->drag_assets */,
@@ -622,6 +625,7 @@ public:
 
 	int modify_edithandles();
 	int modify_pluginhandles();
+	int modify_transnhandles();
 	void finish_modify_handles();
 	void rescale_proxy(EDL *clip, int orig_scale, int new_scale);
 	void add_proxy(ArrayList<Indexable*> *orig_assets,
@@ -839,8 +843,8 @@ public:
 	static void add_plugins(ArrayList<PluginServer*> &plugins);
 	static void delete_plugins();
 	void speed_before();
-	int speed_after(int done);
-	int normalize_speed(EDL *old_edl, EDL *new_edl);
+	int speed_after(int done, int edit_speed);
+	int normalize_speed(EDL *old_edl, EDL *new_edl, int edit_speed);
 	int get_cpus(int out_w, int out_h);
 	int get_cpus();
 //