add edit clear submenu/clear hard_edges, fix tessy gl segv, mask toolgui layout,...

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

diff --git a/cinelerra-5.1/cinelerra/playback3d.h b/cinelerra-5.1/cinelerra/playback3d.h
index 6a38d7aa57b93dc3c9f5e9cf75cba70df2e41dfa..edd7726dc6e321ef704f6dc0671ec06ae974c562 100644 (file)
--- a/cinelerra-5.1/cinelerra/playback3d.h
+++ b/cinelerra-5.1/cinelerra/playback3d.h
@@ -29,7 +29,7 @@
 #include "bcwindowbase.inc"
 #include "canvas.inc"
 #include "condition.inc"
-#include "maskauto.inc"
+#include "maskauto.h"
 #include "maskautos.inc"
 #include "mutex.inc"
 #include "mwindow.inc"
@@ -205,7 +205,6 @@ public:
        {
 // 5
                WRITE_BUFFER = LAST_COMMAND,
-               FINISH_OUTPUT,
                CLEAR_OUTPUT,
                OVERLAY,
                DO_FADE,
@@ -279,19 +278,12 @@ public:
 // output - passed when rendering refresh frame.  If 0, the canvas is cleared.
        void clear_output(Canvas *canvas, VFrame *output);
 
-// Finish all active opengl requests
-       void finish_output(Canvas *canvas);
-
        void do_fade(Canvas *canvas, VFrame *frame, float fade);
        void convert_cmodel(Canvas *canvas, VFrame *output, int dst_cmodel);
 
-       void do_mask(Canvas *canvas,
-               VFrame *output,
-               int64_t start_position_project,
-               MaskAutos *keyframe_set,
-               MaskAuto *keyframe,
-               MaskAuto *default_auto);
-
+       void draw_spots(MaskSpots &spots, int ix1,int iy1, int ix2,int iy2);
+       void do_mask(Canvas *canvas, VFrame *output, int64_t start_position_project,
+               MaskAutos *keyframe_set, MaskAuto *keyframe, MaskAuto *default_auto);
 
 // Overlay a virtual node on the framebuffer
        void overlay(Canvas *canvas,
@@ -332,7 +324,6 @@ private:
        void init_frame(Playback3DCommand *command, int is_yuv=0);
        void write_buffer_sync(Playback3DCommand *command);
        void draw_output(Playback3DCommand *command, int flip_y);
-       void finish_output_sync(Playback3DCommand *command);
        void clear_output_sync(Playback3DCommand *command);
        void clear_input_sync(Playback3DCommand *command);
        void overlay_sync(Playback3DCommand *command);