X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.h;h=e2a0a73b9ba18bd6ec76c2c665e149d5ed279d58;hp=fecb525888798c111fcfe556cb7b0a9621faf57a;hb=6050493632cb3681227b7ec8c12decd449dcf66f;hpb=93cd60723f8816b0c787b1ce9fe7aa6067e0e749

diff --git a/cinelerra-5.1/cinelerra/mwindow.h b/cinelerra-5.1/cinelerra/mwindow.h
index fecb5258..e2a0a73b 100644
--- a/cinelerra-5.1/cinelerra/mwindow.h
+++ b/cinelerra-5.1/cinelerra/mwindow.h
@@ -82,6 +82,7 @@
 #include "sharedlocation.inc"
 #include "sighandler.inc"
 #include "splashgui.inc"
+#include "shuttle.inc"
 #include "theme.inc"
 #include "thread.h"
 #include "threadloader.inc"
@@ -102,8 +103,6 @@
 
 #define FONT_SEARCHPATH "fonts"
 
-// All entry points for commands except for window locking should be here.
-// This allows scriptability.
 
 class MWindow : public Thread
 {
@@ -187,7 +186,7 @@ public:
 		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 doall);
+	void fit_autos(int all);
 	void change_currentautorange(int autogrouptype, int increment, int changemax);
 	void expand_autos(int changeall, int domin, int domax);
 	void shrink_autos(int changeall, int domin, int domax);
@@ -209,9 +208,11 @@ public:
 	void dump_plugindb(FILE *fp);
 	void stop_playback(int wait);
 	void stop_transport();
+	void undo_before(const char *description = "", void *creator = 0);
+	void undo_after(const char *description, uint32_t load_flags, int changes_made = 1);
 
-	void queue_mixers(EDL *edl, int command, int wait_tracking,
-		int use_inout, int update_refresh, int toggle_audio, int loop_play);
+	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();
 	void refresh_mixers(int dir=1);
@@ -260,6 +261,8 @@ public:
 	int find_selection(double position, int scroll_display = 0);
 	void toggle_camera_xyz();
 	void toggle_projector_xyz();
+	double get_position();
+	void set_position(double position);
 
 // seek to labels
 // shift_down must be passed by the caller because different windows call
@@ -348,6 +351,7 @@ public:
 	void clear_labels();
 	int clear_labels(double start, double end);
 	void concatenate_tracks();
+	int copy_flags(int copy_flags=COPY_CLIPBOARD);
 	void copy();
 	int copy(double start, double end);
 	void cut();
@@ -403,8 +407,7 @@ public:
 	void cut_selected_edits(int collapse, int packed);
 // Move edit to new position
 	void move_edits(ArrayList<Edit*> *edits, Track *track, double position,
-// 0 - old style (cut and insert elswhere), 1- new style - (clear and overwrite elsewere)
-		int behaviour);
+		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 paste_clipboard(Track *first_track, double position, int overwrite,
@@ -473,16 +476,16 @@ public:
 
 	void set_automation_mode(int mode);
 	void set_keyframe_type(int mode);
-	void set_auto_keyframes(int value, int lock_mwindow, int lock_cwindow);
+	void set_auto_keyframes(int value);
 	void set_auto_visibility(Autos *autos, int value);
 	void set_labels_follow_edits(int value);
 
 // Update the editing mode
-	int set_editing_mode(int new_editing_mode, int lock_mwindow, int lock_cwindow);
+	int set_editing_mode(int new_editing_mode);
 	void toggle_editing_mode();
-	void set_inpoint(int is_mwindow);
-	void set_outpoint(int is_mwindow);
-	void unset_inoutpoint(int is_mwindow);
+	void set_inpoint();
+	void set_outpoint();
+	void unset_inoutpoint();
 	void toggle_loop_playback();
 	void trim_selection();
 // Synchronize EDL settings with all playback engines depending on current
@@ -490,7 +493,7 @@ public:
 	void sync_parameters(int change_type = CHANGE_PARAMS);
 	void save_clip(EDL *new_edl, const char *txt);
 	void to_clip(EDL *edl, const char *txt, int all);
-	int toggle_label(int is_mwindow);
+	int toggle_label();
 	void undo_entry(BC_WindowBase *calling_window_gui);
 	void redo_entry(BC_WindowBase *calling_window_gui);
 	void save_undo_data();
@@ -551,6 +554,8 @@ public:
 
 // Main undo stack
 	MainUndo *undo;
+	int undo_command;
+
 	BC_Hash *defaults;
 	Assets *assets;
 // CICaches for drawing timeline only
@@ -707,6 +712,7 @@ public:
 
 	void init_preferences();
 	void init_signals();
+	void init_shuttle();
 	void init_theme();
 	void init_compositor();
 	void init_levelwindow();
@@ -731,6 +737,7 @@ public:
 	int restart_status;
 	int screens;
 	int in_destructor;
+	Shuttle *shuttle;
 };
 
 #endif