X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fvwindowgui.C;h=25404f32f2f597c1169fb0bbc31ad7a6a0ba2ae3;hb=b2dd11566e4788acc8d38bdfbc20c8d5772106e5;hp=9c29ec997890eb21bcdd92ec752cc1365a2ba26b;hpb=98e035865979cda9805a58a85d52f8d70a7ec54e;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/vwindowgui.C b/cinelerra-5.1/cinelerra/vwindowgui.C
index 9c29ec99..25404f32 100644
--- a/cinelerra-5.1/cinelerra/vwindowgui.C
+++ b/cinelerra-5.1/cinelerra/vwindowgui.C
@@ -237,7 +237,6 @@ void VWindowGUI::create_objects()
 
 	canvas = new VWindowCanvas(mwindow, this);
 	canvas->create_objects(mwindow->edl);
-	canvas->use_vwindow();
 	char vsplash_path[BCTEXTLEN];
 	int vsplash_len = sizeof(vsplash_path)-1;
 	snprintf(vsplash_path, vsplash_len, "%s/vsplash.png", File::get_cindat_path());
@@ -558,7 +557,8 @@ VWindowEditing::VWindowEditing(MWindow *mwindow, VWindow *vwindow)
 		0, // use_cut
 		0, // use_commerical
 		0, // use_goto
-		1) // use_clk2play
+		1, // use_clk2play
+		1) // use_scope
 {
 	this->mwindow = mwindow;
 	this->vwindow = vwindow;
@@ -774,6 +774,12 @@ VWindowCanvas::VWindowCanvas(MWindow *mwindow, VWindowGUI *gui)
 	this->gui = gui;
 }
 
+void VWindowCanvas::create_objects(EDL *edl)
+{
+	Canvas::create_objects(edl);
+	canvas_menu->add_item(new CanvasPopupRemoveSource(this));
+}
+
 void VWindowCanvas::zoom_resize_window(float percentage)
 {
 	EDL *edl = gui->vwindow->get_edl();
@@ -821,17 +827,43 @@ void VWindowCanvas::close_source()
 	gui->vwindow->delete_source(1, 1);
 }
 
+int VWindowCanvas::scope_on()
+{
+	EditPanelScopeDialog *scope_dialog = gui->edit_panel->scope_dialog;
+	if( !scope_dialog || !scope_dialog->scope_gui ) return 0;
+	if( scope_dialog->scope_gui->use_refresh ) return 0;
+	if( scope_dialog->scope_gui->use_release ) return 0;
+	return scope_dialog->running();
+}
 
-void VWindowCanvas::draw_refresh(int flush)
+void VWindowCanvas::draw_scope(VFrame *output, int refresh)
 {
-	EDL *edl = gui->vwindow->get_edl();
+	if( !output ) return;
+	EditPanelScopeDialog *scope_dialog = gui->edit_panel->scope_dialog;
+	if( !scope_dialog || !scope_dialog->scope_gui ) return;
+	if( scope_dialog->scope_gui->use_refresh && !refresh ) return;
+	if( scope_dialog->scope_gui->use_release && refresh >= 0 ) return;
+	scope_dialog->process(output);
+}
 
+int VWindowCanvas::button_release_event()
+{
+	BC_WindowBase *window = get_canvas();
+	if( window && !window->get_video_on() )
+		draw_scope(refresh_frame, -1);
+	return Canvas::button_release_event();
+}
+
+void VWindowCanvas::draw_refresh(int flush)
+{
 	if( !get_canvas()->get_video_on() ) {
 		int cw = get_canvas()->get_w(), ch = get_canvas()->get_h();
 		get_canvas()->clear_box(0, 0, cw, ch);
-		int ow = edl ? get_output_w(edl) : 0;
-		int oh = edl ? get_output_h(edl) : 0;
-		if( ow > 0 && oh > 0 && refresh_frame ) {
+	}
+	EDL *edl = gui->vwindow->get_edl();
+	if( refresh_frame && edl ) {
+		int ow = get_output_w(edl), oh = get_output_h(edl);
+		if( ow > 0 && oh > 0 ) {
 			float in_x1, in_y1, in_x2, in_y2;
 			float out_x1, out_y1, out_x2, out_y2;
 			get_transfers(edl,
@@ -851,6 +883,8 @@ void VWindowCanvas::draw_refresh(int flush)
 				(int)(in_x2 - in_x1), (int)(in_y2 - in_y1),
 				0);
 		}
+	}
+	if( !get_canvas()->get_video_on() ) {
 		draw_overlays();
 		get_canvas()->flash(flush);
 	}