add shuttle dev support, use dflt ff_a/v.png icons, mjpegtools typo patch

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / mwindow.h

diff --git a/cinelerra-5.1/cinelerra/mwindow.h b/cinelerra-5.1/cinelerra/mwindow.h
index fecb525888798c111fcfe556cb7b0a9621faf57a..7950659bb646648146850cac42d283d5503f0802 100644 (file)
--- 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"
@@ -403,8 +404,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,
@@ -707,6 +707,7 @@ public:
 
        void init_preferences();
        void init_signals();
+       void init_shuttle();
        void init_theme();
        void init_compositor();
        void init_levelwindow();
@@ -731,6 +732,7 @@ public:
        int restart_status;
        int screens;
        int in_destructor;
+       Shuttle *shuttle;
 };
 
 #endif