X-Git-Url: https://cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.h;h=d01f9ddb1299ec93dda1c127704148b9a6242e3c;hb=48a6854a1ca58aa291ffc6fe3a48807492dfbef7;hp=74717d8ce6b4cd033af299c60d91c106d973879b;hpb=e719f1246ff9bb42b055306396c9160640a88884;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/mwindow.h b/cinelerra-5.1/cinelerra/mwindow.h
index 74717d8c..d01f9ddb 100644
--- a/cinelerra-5.1/cinelerra/mwindow.h
+++ b/cinelerra-5.1/cinelerra/mwindow.h
@@ -112,8 +112,10 @@ class StackItem
 public:
 	EDL *edl, *new_edl;
 	Indexable *idxbl;
+	Edit *edit;
 	MainUndo *undo;
 	int64_t mtime;
+	double duration;
 };
 
 class Stack : public ArrayList<StackItem>
@@ -144,6 +146,17 @@ public:
 };
 
 
+class DrawTrackMovement : public Thread
+{
+public:
+	DrawTrackMovement(MWindow *mwindow);
+	~DrawTrackMovement();
+	void run();
+
+	MWindow *mwindow;
+};
+
+
 class MWindow : public Thread
 {
 public:
@@ -175,7 +188,7 @@ public:
 // Total horizontal pixels in timeline
 	int get_tracks_width();
 // session stack
-	void stack_push(EDL *edl, Indexable *idxbl);
+	void stack_push(EDL *edl, Indexable *idxbl, Edit *edit=0);
 	void stack_pop();
 	int save(EDL *edl, char *filename, int stat);
 	int save(int save_as);
@@ -272,12 +285,14 @@ public:
 	void close_mixers(int result=1);
 	void open_mixers();
 	ZWindow *get_mixer(Mixer *&mixer);
-	void del_mixer(ZWindow *zwindow);
+	ZWindow *get_mixer(int idx);
+	void close_mixer(ZWindow *zwindow);
 	int mixer_track_active(Track *track);
 	void update_mixer_tracks();
 	void start_mixer();
 	int select_zwindow(ZWindow *zwindow);
 	void tile_mixers();
+	void set_gang_tracks(int v);
 	int load_filenames(ArrayList<char*> *filenames,
 		int load_mode = LOADMODE_REPLACE,
 		int edl_mode = LOADMODE_EDL_CLIP,
@@ -291,6 +306,8 @@ public:
 	int interrupt_indexes();  // Stop index building
 
 	int redraw_time_dependancies();     // after reconfiguring the time format, sample rate, frame rate
+	void draw_trackmovement();          // after reconfiguring tracks/patchbay guis
+	DrawTrackMovement *redraw_tracks;
 
 // =========================================== movement
 
@@ -303,7 +320,8 @@ public:
 	int zoom_sample(int64_t zoom_sample);
 	void zoom_autos(float min, float max);
 	void zoom_amp(int64_t zoom_amp);
-	void zoom_track(int64_t zoom_track);
+	void zoom_atrack(int64_t zoom);
+	void zoom_vtrack(int64_t zoom);
 	int fit_sample();
 	int move_left(int64_t distance = 0);
 	int move_right(int64_t distance = 0);
@@ -441,7 +459,7 @@ public:
 
 // TrackCanvas calls this to insert multiple effects from the drag_pluginservers
 // into pluginset_highlighted.
-	void insert_effects_canvas(double start, double length);
+	void insert_effects_canvas(Track *dest_track, double start, double length);
 
 // CWindow calls this to insert multiple effects from
 // the drag_pluginservers array.
@@ -597,6 +615,7 @@ public:
 	void dump_edl(FILE *fp=stdout);
 	void dump_undo(FILE *fp=stdout);
 	void dump_exe(FILE *fp=stdout);
+	void dump_caches(FILE *fp=stdout);
 	static void trap_hook(FILE *fp, void *vp);
 
 	void reset_android_remote();