X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.h;h=d7e54b1cba31e3cd1d144ae34ba5463e2f5648e5;hb=166867a58d74619aa11aeb562a994cc364d62231;hp=13544431ea22b75a4010e846f690c74bae46f238;hpb=84b52741889e1afee840d7c24009cc139244ce74;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/mwindow.h b/cinelerra-5.1/cinelerra/mwindow.h
index 13544431..d7e54b1c 100644
--- a/cinelerra-5.1/cinelerra/mwindow.h
+++ b/cinelerra-5.1/cinelerra/mwindow.h
@@ -146,6 +146,29 @@ public:
 };
 
 
+class DrawTrackMovement : public Thread
+{
+public:
+	DrawTrackMovement(MWindow *mwindow);
+	~DrawTrackMovement();
+	void run();
+
+	MWindow *mwindow;
+};
+
+class ConfirmRefWindow : public BC_Window
+{
+public:
+	ConfirmRefWindow(MWindow *mwindow, char *path,
+			int px, int py, int cw, int ch);
+	~ConfirmRefWindow();
+	void create_objects();
+
+	MWindow *mwindow;
+	const char *path;
+};
+
+
 class MWindow : public Thread
 {
 public:
@@ -177,7 +200,7 @@ public:
 // Total horizontal pixels in timeline
 	int get_tracks_width();
 // session stack
-	void stack_push(EDL *edl, Indexable *idxbl, Edit *edit=0);
+	void stack_push(EDL *edl, Indexable *idxbl);
 	void stack_pop();
 	int save(EDL *edl, char *filename, int stat);
 	int save(int save_as);
@@ -281,6 +304,9 @@ public:
 	void start_mixer();
 	int select_zwindow(ZWindow *zwindow);
 	void tile_mixers();
+	int masters_to_mixers();
+	void mix_masters();
+	void set_gang_tracks(int v);
 	int load_filenames(ArrayList<char*> *filenames,
 		int load_mode = LOADMODE_REPLACE,
 		int edl_mode = LOADMODE_EDL_CLIP,
@@ -294,6 +320,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
 
@@ -318,6 +346,9 @@ public:
 	void toggle_projector_xyz();
 	double get_position();
 	void set_position(double position);
+	double get_timecode_offset();
+	void set_timecode_offset(double offset);
+	void align_timecodes();
 
 // seek to labels
 // shift_down must be passed by the caller because different windows call
@@ -394,13 +425,13 @@ public:
 		AUDIO_5_1_TO_2,
 		AUDIO_1_TO_1
 	};
-	void add_audio_track_entry(int above, Track *dst);
-	int add_audio_track(int above, Track *dst);
 	void add_clip_to_edl(EDL *edl);
-	void add_video_track_entry(Track *dst = 0);
-	int add_video_track(int above, Track *dst);
-	void add_subttl_track_entry(Track *dst = 0);
-	int add_subttl_track(int above, Track *dst);
+	void add_audio_track_entry(int above, Track *dst);
+	Track *add_audio_track(int above, Track *dst);
+	void add_video_track_entry(int above, Track *dst);
+	Track *add_video_track(int above, Track *dst);
+	void add_subttl_track_entry(int above, Track *dst);
+	Track *add_subttl_track(int above, Track *dst);
 
 	void asset_to_all();
 	void asset_to_size();
@@ -416,6 +447,7 @@ public:
 	void clear_hard_edges();
 	int clear_hard_edges(double start, double end);
 	void clear_select();
+	void select_edits();
 	void concatenate_tracks();
 	int copy_flags(int copy_flags=COPY_CLIPBOARD);
 	void copy();
@@ -445,7 +477,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.
@@ -486,6 +518,10 @@ public:
 	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);
@@ -529,7 +565,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 */,
@@ -578,6 +614,7 @@ public:
 // in the clipboard.
 	int paste_default_keyframe();
 	int clear_default_keyframe();
+	void create_keyframes(int mask, int mode);
 
 	FloatAuto* get_float_auto(PatchGUI *patch,int idx);
 	IntAuto* get_int_auto(PatchGUI *patch,int idx);
@@ -803,8 +840,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();
 //