X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.h;h=8a23118a25210e0a8a4897895d97c8a62e651b9a;hp=e2a0a73b9ba18bd6ec76c2c665e149d5ed279d58;hb=eb7b1a0bb84ed4f40b651b74ff72e63b97cce1c2;hpb=6050493632cb3681227b7ec8c12decd449dcf66f

diff --git a/cinelerra-5.1/cinelerra/mwindow.h b/cinelerra-5.1/cinelerra/mwindow.h
index e2a0a73b..8a23118a 100644
--- a/cinelerra-5.1/cinelerra/mwindow.h
+++ b/cinelerra-5.1/cinelerra/mwindow.h
@@ -62,6 +62,7 @@
 #include "mainsession.inc"
 #include "mainundo.inc"
 #include "maxchannels.h"
+#include "mixersalign.inc"
 #include "mutex.inc"
 #include "mwindow.inc"
 #include "mwindowgui.inc"
@@ -140,8 +141,9 @@ public:
 	void show_gwindow();
 	void hide_gwindow();
 	void restore_windows();
-	void save_layout(int no);
-	void load_layout(int no);
+	void load_layout(const char *layout);
+	void save_layout(const char *layout);
+	void delete_layout(const char *layout);
 	int tile_windows(int window_config);
 	char *get_cwindow_display();
 	void set_screens(int value);
@@ -181,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);
@@ -213,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);
@@ -226,7 +224,6 @@ public:
 	void start_mixer();
 	int select_zwindow(ZWindow *zwindow);
 	void tile_mixers();
-
 	int load_filenames(ArrayList<char*> *filenames,
 		int load_mode = LOADMODE_REPLACE,
 // Cause the project filename on the top of the window to be updated.
@@ -368,7 +365,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);
@@ -408,8 +404,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);
@@ -634,6 +629,8 @@ public:
 // Mixer
 	Mutex *zwindows_lock;
 	ArrayList<ZWindow*> zwindows;
+	MixersAlign *mixers_align;
+
 // Asset manager
 	AWindow *awindow;
 // Automation window