repair default keyframe load, tweak init default histogram threshold

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

diff --git a/cinelerra-5.1/cinelerra/canvas.h b/cinelerra-5.1/cinelerra/canvas.h
index 27336588f67f166125b6a13d64dc86056837da22..9a78095eacea972c62543eafe57028edc0e39d21 100644 (file)
--- a/cinelerra-5.1/cinelerra/canvas.h
+++ b/cinelerra-5.1/cinelerra/canvas.h
@@ -25,6 +25,7 @@
 #include "edl.inc"
 #include "guicast.h"
 #include "mwindow.inc"
+#include "videodevice.inc"
 
 // Output for all X11 video
 
@@ -96,6 +97,7 @@ public:
        virtual int button_release_event() { return 0; };
        virtual int button_press_event();
        virtual int cursor_motion_event() { return 0; };
+       virtual int need_overlays() { return 1; }
        virtual void draw_overlays() { };
        virtual void toggle_controls() { } ;
        virtual int get_cwindow_controls() { return 0; };
@@ -141,8 +143,11 @@ public:
        virtual int get_xscroll() { return 0; };
        virtual int get_yscroll() { return 0; };
        virtual float get_zoom() { return 0; };
-// Redraws the image
+// Updates the refresh_frame
+       void update_refresh(VideoDevice *device, VFrame *output_frame);
+// Redraws the refresh_frame
        virtual void draw_refresh(int flush = 1) {};
+       virtual void clear(int flush=1);
 
 // Get top left offset of canvas relative to output.
 // Normally negative.  Can be positive if output is smaller than canvas.
@@ -221,10 +226,7 @@ public:
 
 private:
        void get_scrollbars(EDL *edl,
-               int &canvas_x,
-               int &canvas_y,
-               int &canvas_w,
-               int &canvas_h);
+               int &canvas_x, int &canvas_y, int &canvas_w, int &canvas_h);
        Mutex *canvas_lock;
 };
 
@@ -233,10 +235,7 @@ class CanvasOutput : public BC_SubWindow
 {
 public:
        CanvasOutput(Canvas *canvas,
-        int x,
-        int y,
-        int w,
-        int h);
+               int x, int y, int w, int h);
        ~CanvasOutput();
 
        int cursor_leave_event();
@@ -255,9 +254,7 @@ public:
 class CanvasFullScreen : public BC_FullScreen
 {
 public:
-       CanvasFullScreen(Canvas *canvas,
-        int w,
-        int h);
+       CanvasFullScreen(Canvas *canvas, int w, int h);
        ~CanvasFullScreen();
 
        Canvas *canvas;