X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.h;h=be468ac9249c107e99fa2f3bab8f056e445f75e1;hb=a0ed17a5d6ecf2b010d977bc1f9b7226f24c20f6;hp=3add4e79cb38ac02a7a0eec06164992059c3225c;hpb=4710b00debcb86b8ff626c4af3473afe338408ae;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/mwindow.h b/cinelerra-5.1/cinelerra/mwindow.h
index 3add4e79..be468ac9 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"
@@ -182,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);
@@ -214,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);
@@ -227,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.
@@ -409,8 +405,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);
@@ -635,6 +630,8 @@ public:
 // Mixer
 	Mutex *zwindows_lock;
 	ArrayList<ZWindow*> zwindows;
+	MixersAlign *mixers_align;
+
 // Asset manager
 	AWindow *awindow;
 // Automation window