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

diff --git a/cinelerra-5.1/cinelerra/mwindow.h b/cinelerra-5.1/cinelerra/mwindow.h
index d01f9ddb..c636d787 100644
--- a/cinelerra-5.1/cinelerra/mwindow.h
+++ b/cinelerra-5.1/cinelerra/mwindow.h
@@ -156,6 +156,18 @@ public:
 	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
 {
@@ -188,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);
@@ -197,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();
@@ -253,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
@@ -292,6 +305,8 @@ 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,
@@ -332,6 +347,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
@@ -408,13 +426,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();
@@ -430,6 +448,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();
@@ -496,6 +515,10 @@ 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);
@@ -543,7 +566,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 */,
@@ -592,6 +615,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);
@@ -600,6 +624,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,
@@ -817,8 +842,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();
 //