fix draw_refresh opengl deadlock, cleanup last chkin

[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 1a65426064bbecc2da026e18dedaf72f97538bd2..2fd2a23e32dc4b5a3a571789cd52e529ee0e7dbe 100644 (file)
--- a/cinelerra-5.1/cinelerra/canvas.h
+++ b/cinelerra-5.1/cinelerra/canvas.h
@@ -87,8 +87,8 @@ public:
        virtual void draw_overlays() {}
        virtual void toggle_controls() {}
        virtual int get_cwindow_controls() { return 0; }
-       virtual int get_fullscreen() { return 0; }
-       virtual void set_fullscreen(int value) {}
+       virtual int get_fullscreen();
+       virtual void set_fullscreen(int value);
 
        int cursor_leave_event_base(BC_WindowBase *caller);
        int cursor_enter_event_base(BC_WindowBase *caller);
@@ -134,7 +134,7 @@ public:
        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);
+       virtual void clear(int flash=1);
 
 // Get top left offset of canvas relative to output.
 // Normally negative.  Can be positive if output is smaller than canvas.
@@ -200,6 +200,7 @@ public:
 // For cases where video is not enabled on the canvas but processing is
 // occurring for a single frame, this causes the status to update.
        int is_processing;
+       int is_fullscreen;
 // Cursor is inside video surface
        int cursor_inside;
        int view_x;