fix aspect ratio on split screen drag handle, add videoscope to editpanel in cwindow...

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

diff --git a/cinelerra-5.1/cinelerra/canvas.h b/cinelerra-5.1/cinelerra/canvas.h
index 1ea04448351575048d54faaa753a6b4c85a9db88..c3cb283140e39d9a61d02167423abbc776f77112 100644 (file)
--- a/cinelerra-5.1/cinelerra/canvas.h
+++ b/cinelerra-5.1/cinelerra/canvas.h
@@ -80,16 +80,12 @@ public:
        virtual int get_cwindow_controls() { return 0; }
        virtual int get_fullscreen();
        virtual int get_clear_color();
-       virtual int set_fullscreen(int on, int unlock=1);
+       virtual int set_fullscreen(int on, int unlock);
 
        int cursor_leave_event_base(BC_WindowBase *caller);
        int cursor_enter_event_base(BC_WindowBase *caller);
        int button_press_event_base(BC_WindowBase *caller);
        int keypress_event(BC_WindowBase *caller);
-// Use menu different options for different windows
-       void use_cwindow();
-       void use_rwindow();
-       void use_vwindow();
        void use_auxwindow(BC_WindowBase *aux);
 
 // Provide canvas dimensions since a BC_Bitmap containing obsolete dimensions
@@ -130,6 +126,10 @@ public:
 // Redraws the refresh_frame
        virtual void draw_refresh(int flush = 1) {};
        virtual void clear(int flash=1);
+// draw scope
+       virtual int scope_on() { return 0; }
+       virtual void draw_scope(VFrame *frame) {}
+       void process_scope(VideoDevice *video, VFrame *frame);
 
 // Get top left offset of canvas relative to output.
 // Normally negative.  Can be positive if output is smaller than canvas.
@@ -283,8 +283,6 @@ public:
        CanvasFullScreenPopup(Canvas *canvas);
 
        void create_objects();
-       void use_cwindow();
-
        Canvas *canvas;
 };
 
@@ -303,12 +301,7 @@ public:
        ~CanvasPopup();
 
        void create_objects();
-       void use_cwindow();
-       void use_rwindow();
-       void use_vwindow();
-
        Canvas *canvas;
-       CanvasToggleControls *toggle_controls;
 };
 
 class CanvasZoomSize : public BC_MenuItem
@@ -377,15 +370,6 @@ public:
        Canvas *canvas;
 };
 
-class CanvasToggleControls : public BC_MenuItem
-{
-public:
-       CanvasToggleControls(Canvas *canvas);
-       int handle_event();
-       static char* calculate_text(int cwindow_controls);
-       Canvas *canvas;
-};
-
 class CanvasFullScreenItem : public BC_MenuItem
 {
 public:
@@ -402,7 +386,6 @@ public:
        Canvas *canvas;
 };
 
-
 class CanvasPopupRemoveSource : public BC_MenuItem
 {
 public:
@@ -411,8 +394,4 @@ public:
        Canvas *canvas;
 };
 
-
-
-
-
 #endif