X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fplayback3d.h;h=cd7aab02c552a01fc3ac51dcc37240587d047076;hp=1f3dd59a4ef2f91c282e6cd119df76549af4e6c3;hb=32a609a6bd1181993569399ab51f314dc7cb4fba;hpb=aa9374b902768107ebda0cffe739325ffed372f6

diff --git a/cinelerra-5.1/cinelerra/playback3d.h b/cinelerra-5.1/cinelerra/playback3d.h
index 1f3dd59a..cd7aab02 100644
--- 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();
-
 	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,
@@ -329,10 +321,10 @@ public:
 
 private:
 // Called by write_buffer and clear_frame to initialize OpenGL flags
-	void init_frame(Playback3DCommand *command, int is_yuv=0);
+	void color_frame(Playback3DCommand *command,
+		float r, float g, float b, float a);
 	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);