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=afbf356471ead585b07cc91929f5391c918d7792;hb=1db0dacec8f9d7f5687e582bd282d9bf83bd58f0;hpb=32a609a6bd1181993569399ab51f314dc7cb4fba

diff --git a/cinelerra-5.1/cinelerra/mwindow.h b/cinelerra-5.1/cinelerra/mwindow.h
index afbf3564..c636d787 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,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:
@@ -169,6 +194,7 @@ public:
 	int load_defaults();
 	int save_defaults();
 	int set_filename(const char *filename);
+	int set_titlebar(const char *filename);
 // Total vertical pixels in timeline
 	int get_tracks_height();
 // Total horizontal pixels in timeline
@@ -176,11 +202,14 @@ public:
 // session stack
 	void stack_push(EDL *edl, Indexable *idxbl);
 	void stack_pop();
+	int save(EDL *edl, char *filename, int stat);
+	int save(int save_as);
+	void show_plugins();
 	void clip_to_media();
 	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();
@@ -224,6 +253,9 @@ public:
 		int edit_plugins,
 		int edit_autos,
 		int overwrite);
+	void collect_effects();
+	void paste_effects();
+
 // Reset everything for a load
 	void update_project(int load_mode);
 	void update_preferences(Preferences *prefs);
@@ -233,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
@@ -265,12 +298,16 @@ 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();
+	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,
@@ -284,6 +321,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
 
@@ -296,7 +335,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);
@@ -307,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
@@ -318,6 +361,7 @@ public:
 	int prev_edit_handle(int shift_down);
 // seek to keyframes
 	int nearest_plugin_keyframe(int shift_down, int dir);
+	int nearest_auto_keyframe(int shift_down, int dir);
 // offset is pixels to add to track_start
 	void trackmovement(int offset, int pane_number);
 // view_start is pixels
@@ -340,6 +384,7 @@ public:
 	void load_backup();
 	void show_plugin(Plugin *plugin);
 	void hide_plugin(Plugin *plugin, int lock);
+	void hide_plugin(int plugin_id, int lock);
 	void hide_plugins();
 	void delete_plugin(PluginServer *plugin);
 // Update plugins with configuration changes.
@@ -381,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();
@@ -403,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();
@@ -432,7 +478,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.
@@ -469,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);
@@ -516,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 */,
@@ -549,6 +599,7 @@ public:
 	void redo_entry(BC_WindowBase *calling_window_gui);
 	void save_undo_data();
 	void load_undo_data();
+	void remove_undo_data();
 	int copy_target(const char *path, const char *target);
 	int link_target(const char *real_path, const char *link_path, int relative);
 	void save_project(const char *dir, int save_mode, int overwrite, int reload);
@@ -564,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);
@@ -572,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,
@@ -587,6 +640,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();
@@ -596,7 +650,7 @@ public:
 	int optimize_assets();            // delete unused assets from the cache and assets
 // render edl assets to specified format, then replace in edl
 	void start_convert(Asset *format_asset, const char *suffix,
-			float beep, int remove_originals);
+			float beep, int to_proxy, int remove_originals);
 	void finish_convert(int remove_originals);
 	ConvertRender *convert_render;
 
@@ -788,8 +842,10 @@ 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();
 //
 	void clean_indexes();
 //	TimeBomb timebomb;