yuv colorspace/range + prefs, ffmpeg colorrange probe, x11 direct force colormodel...

[goodguy/history.git] / cinelerra-5.1 / cinelerra / cwindowgui.h

diff --git a/cinelerra-5.1/cinelerra/cwindowgui.h b/cinelerra-5.1/cinelerra/cwindowgui.h
index 931047e599f6d621a5ff38c26a86ee77dacfe017..8ab72ac2c2a0bde800a7e0f442425ec86f32085d 100644 (file)
--- a/cinelerra-5.1/cinelerra/cwindowgui.h
+++ b/cinelerra-5.1/cinelerra/cwindowgui.h
@@ -60,8 +60,10 @@ public:
        CWindowGUI(MWindow *mwindow, CWindow *cwindow);
        ~CWindowGUI();
 
-    void create_objects();
+       void create_objects();
        int resize_event(int w, int h);
+       void zoom_canvas(double value, int update_menu);
+       float get_auto_zoom();
 
 // Events for the fullscreen canvas fall through to here.
        int button_press_event();
@@ -70,9 +72,6 @@ public:
        int button_release_event();
        int cursor_motion_event();
 
-
-       void zoom_canvas(int do_auto, double value, int update_menu);
-
        int close_event();
        int keypress_event();
        int translation_event();
@@ -149,7 +148,6 @@ public:
 // Origin for camera and projector operations during last button press
        float center_x, center_y, center_z;
        float control_in_x, control_in_y, control_out_x, control_out_y;
-       int current_tool;
 // Must recalculate the origin when pressing shift.
 // Switch toggle on and off to recalculate origin.
        int translating_zoom;
@@ -168,8 +166,7 @@ public:
        void overwrite_selection();
        void set_inpoint();
        void set_outpoint();
-       void clear_inpoint();
-       void clear_outpoint();
+       void unset_inoutpoint();
        void to_clip();
        void toggle_label();
        void prev_label();
@@ -200,6 +197,7 @@ public:
        CWindowZoom(MWindow *mwindow, CWindowGUI *gui, int x, int y, int w);
        virtual ~CWindowZoom();
        int handle_event();
+       void update(double value);
        MWindow *mwindow;
        CWindowGUI *gui;
 };