X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcwindowtool.C;h=6a4a1d7255deaec89758e6729d6e45e94738dbe7;hb=32fa5523f2d5a7d6abcbdddce56b8d65cd83fb88;hp=64c9f4f38710e0305a63ed991828a71a695d285c;hpb=21b49090a36821cfe97bdfc573c7fbacc80653d1;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/cwindowtool.C b/cinelerra-5.1/cinelerra/cwindowtool.C
index 64c9f4f3..6a4a1d72 100644
--- a/cinelerra-5.1/cinelerra/cwindowtool.C
+++ b/cinelerra-5.1/cinelerra/cwindowtool.C
@@ -457,10 +457,6 @@ void CWindowCropGUI::update()
 }
 
 
-
-
-
-
 CWindowEyedropGUI::CWindowEyedropGUI(MWindow *mwindow, CWindowTool *thread)
  : CWindowToolGUI(mwindow,
  	thread,
@@ -675,10 +671,6 @@ int CWindowCurveToggle::handle_event()
 }
 
 
-
-
-
-
 CWindowCameraGUI::CWindowCameraGUI(MWindow *mwindow, CWindowTool *thread)
  : CWindowToolGUI(mwindow,
  	thread,
@@ -1120,21 +1112,6 @@ int CWindowCameraBottom::handle_event()
 }
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 CWindowProjectorGUI::CWindowProjectorGUI(MWindow *mwindow, CWindowTool *thread)
  : CWindowToolGUI(mwindow,
  	thread,
@@ -1330,44 +1307,6 @@ void CWindowProjectorGUI::update()
 	}
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 CWindowProjectorLeft::CWindowProjectorLeft(MWindow *mwindow, CWindowProjectorGUI *gui, int x, int y)
  : BC_Button(x, y, mwindow->theme->get_image_set("left_justify"))
 {
@@ -1576,12 +1515,6 @@ int CWindowProjectorBottom::handle_event()
 }
 
 
-
-
-
-
-
-
 CWindowMaskMode::CWindowMaskMode(MWindow *mwindow,
 	CWindowToolGUI *gui, int x, int y, const char *text)
  : BC_PopupMenu(x, y, 220, text, 1)
@@ -2046,6 +1979,30 @@ int CWindowMaskBeforePlugins::handle_event()
 }
 
 
+CWindowDisableOpenGLMasking::CWindowDisableOpenGLMasking(CWindowToolGUI *gui, int x, int y)
+ : BC_CheckBox(x, y, 1, _("Disable OpenGL masking"))
+{
+	this->gui = gui;
+}
+
+int CWindowDisableOpenGLMasking::handle_event()
+{
+	Track *track;
+	MaskAutos *autos;
+	MaskAuto *keyframe;
+	SubMask *mask;
+	MaskPoint *point;
+	((CWindowMaskGUI*)gui)->get_keyframe(track, autos, keyframe, mask, point, 1);
+
+	if (keyframe) {
+		keyframe->disable_opengl_masking = get_value();
+		gui->update_preview();
+	}
+	return 1;
+}
+
+
+
 
 
 
@@ -2057,7 +2014,7 @@ CWindowMaskGUI::CWindowMaskGUI(MWindow *mwindow, CWindowTool *thread)
  	thread,
 	_(PROGRAM_NAME ": Mask"),
 	330,
-	280)
+	310)
 {
 	this->mwindow = mwindow;
 	this->thread = thread;
@@ -2121,19 +2078,16 @@ void CWindowMaskGUI::create_objects()
 
 	x = 10;
 	y += this->y->get_h() + margin;
-	add_subwindow(title = new BC_Title(x, y, _("Press Ctrl to move a point")));
+	add_subwindow(title = new BC_Title(x, y, _("Press Shift to move an end point")));
 	y += title->get_h() + margin;
-	add_subwindow(title = new BC_Title(x, y, _("Press Alt to translate the mask")));
+	add_subwindow(title = new BC_Title(x, y, _("Press Ctrl to move a control point")));
 	y += title->get_h() + margin;
-	add_subwindow(title = new BC_Title(x, y, _("Press Shift to edit bezier curve")));
-
+	add_subwindow(title = new BC_Title(x, y, _("Press Alt to translate the mask")));
 	y += 30;
-//	add_subwindow(title = new BC_Title(x, y, _("Apply mask before plugins:")));
 
-	add_subwindow(this->apply_before_plugins = new CWindowMaskBeforePlugins(this,
-		10,
-		y));
-//	this->apply_before_plugins->create_objects();
+	add_subwindow(this->apply_before_plugins = new CWindowMaskBeforePlugins(this, 10, y));
+	y += this->apply_before_plugins->get_h() + margin;
+	add_subwindow(this->disable_opengl_masking = new CWindowDisableOpenGLMasking(this, 10, y));
 
 	update();
 	unlock_window();
@@ -2201,6 +2155,7 @@ void CWindowMaskGUI::update()
 			feather->update((int64_t)autos->get_feather(position_i, PLAY_FORWARD));
 			value->update((int64_t)autos->get_value(position_i, PLAY_FORWARD));
 			apply_before_plugins->update((int64_t)keyframe->apply_before_plugins);
+			disable_opengl_masking->update((int64_t)keyframe->disable_opengl_masking);
 		}
 	}