X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcwindowgui.C;h=beac0f8184b22e87b9538b2781b7573a56c03a44;hb=6cf1b80d50c6b458241a0d43487fb8519c575c97;hp=c0d64487f0b087dd67b5a5183d6677039f7dd30c;hpb=21af3206552d78919dad02f83c08439bedb05c89;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/cwindowgui.C b/cinelerra-5.1/cinelerra/cwindowgui.C
index c0d64487..beac0f81 100644
--- a/cinelerra-5.1/cinelerra/cwindowgui.C
+++ b/cinelerra-5.1/cinelerra/cwindowgui.C
@@ -281,7 +281,7 @@ int CWindowGUI::button_press_event()
 	if( current_operation == CWINDOW_NONE &&
 	    mwindow->edl != 0 && canvas->get_canvas() &&
 	    mwindow->edl->session->cwindow_click2play &&
-	    canvas->get_canvas()->get_cursor_over_window() ) {
+	    canvas->get_canvas()->cursor_above() ) {
 		switch( get_buttonpress() ) {
 		case LEFT_BUTTON:
 			if( !cwindow->playback_engine->is_playing_back ) {
@@ -744,7 +744,7 @@ CWindowEditing::CWindowEditing(MWindow *mwindow, CWindow *cwindow)
 		mwindow->theme->cedit_x, mwindow->theme->cedit_y,
 		mwindow->edl->session->editing_mode,
 		0, // use_editing_mode
-		1, // use_keyframe
+		0, // use_keyframe
 		0, // use_splice
 		0, // use_overwrite
 		1, // use_copy
@@ -758,7 +758,8 @@ CWindowEditing::CWindowEditing(MWindow *mwindow, CWindow *cwindow)
 		1, // use_cut
 		0, // use_commerical
 		0, // use_goto
-		1) // use_clk2play
+		1, // use_clk2play
+		1) // use_scope
 {
 	this->mwindow = mwindow;
 	this->cwindow = cwindow;
@@ -1091,6 +1092,18 @@ int CWindowCanvas::do_scroll(EDL *edl, float cursor_x, float cursor_y)
 	return 1;
 }
 
+int CWindowCanvas::scope_on()
+{
+	return !gui->edit_panel->scope_dialog ? 0 :
+		gui->edit_panel->scope_dialog->running();
+}
+
+void CWindowCanvas::draw_scope(VFrame *output)
+{
+	if( gui->edit_panel->scope_dialog && output )
+		gui->edit_panel->scope_dialog->process(output);
+}
+
 void CWindowCanvas::draw_refresh(int flush)
 {
 	BC_WindowBase *window = get_canvas();