X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fvwindowgui.C;h=dfbffff0b7bbc1ae580304d6ff62e775298e793b;hp=58f0ef946fd806c64061ae4219f5834f51348614;hb=HEAD;hpb=4a90ef3ae46465c0634f81916b79e279e4bd9961

diff --git a/cinelerra-5.1/cinelerra/vwindowgui.C b/cinelerra-5.1/cinelerra/vwindowgui.C
index 58f0ef94..dfbffff0 100644
--- a/cinelerra-5.1/cinelerra/vwindowgui.C
+++ b/cinelerra-5.1/cinelerra/vwindowgui.C
@@ -112,6 +112,7 @@ void VWindowGUI::draw_wave()
 	int w = mwindow->edl->session->output_w;
 	int h = mwindow->edl->session->output_h;
 	VFrame *vframe = new VFrame(w, h, BC_RGB888);
+	vframe->clear_frame();
 	int sample_rate = mwindow->edl->get_sample_rate();
 	int channels = mwindow->edl->session->audio_channels;
 	if( channels > 2 ) channels = 2;
@@ -200,9 +201,9 @@ void VWindowGUI::update_sources(const char *title)
 
 void VWindowGUI::create_objects()
 {
+	lock_window("VWindowGUI::create_objects");
 	in_point = 0;
 	out_point = 0;
-	lock_window("VWindowGUI::create_objects");
 	set_icon(mwindow->theme->get_image("vwindow_icon"));
 
 //printf("VWindowGUI::create_objects 1\n");
@@ -461,26 +462,22 @@ void VWindowGUI::drag_motion()
 
 int VWindowGUI::drag_stop()
 {
-	if(get_hidden()) return 0;
+	if( get_hidden() ) return 0;
 
-	if(highlighted &&
-		mwindow->session->current_operation == DRAG_ASSET)
-	{
+	if( highlighted &&
+	    mwindow->session->current_operation == DRAG_ASSET ) {
 		highlighted = 0;
 		canvas->draw_refresh();
 		unlock_window();
 
-		Indexable *indexable = mwindow->session->drag_assets->size() ?
-			mwindow->session->drag_assets->get(0) :
-			0;
-		EDL *edl = mwindow->session->drag_clips->size() ?
-			mwindow->session->drag_clips->get(0) :
-			0;
-		if(indexable)
+		Indexable *indexable =
+			mwindow->session->drag_assets->size() > 0 ?
+				(Indexable *)mwindow->session->drag_assets->get(0) :
+			mwindow->session->drag_clips->size() > 0 ?
+				(Indexable *)mwindow->session->drag_clips->get(0) : 0;
+		if( indexable )
 			vwindow->change_source(indexable);
-		else
-		if(edl)
-			vwindow->change_source(edl);
+
 		lock_window("VWindowGUI::drag_stop");
 		return 1;
 	}
@@ -567,7 +564,7 @@ VWindowEditing::~VWindowEditing()
 
 void VWindowEditing::copy_selection()
 {
-	vwindow->copy();
+	vwindow->copy(subwindow->shift_down());
 }
 
 void VWindowEditing::splice_selection()
@@ -575,7 +572,7 @@ void VWindowEditing::splice_selection()
 	if(vwindow->get_edl())
 	{
 		mwindow->gui->lock_window("VWindowEditing::splice_selection");
-		mwindow->splice(vwindow->get_edl());
+		mwindow->splice(vwindow->get_edl(), subwindow->shift_down());
 		mwindow->gui->unlock_window();
 	}
 }
@@ -585,7 +582,7 @@ void VWindowEditing::overwrite_selection()
 	if(vwindow->get_edl())
 	{
 		mwindow->gui->lock_window("VWindowEditing::overwrite_selection");
-		mwindow->overwrite(vwindow->get_edl());
+		mwindow->overwrite(vwindow->get_edl(), subwindow->shift_down());
 		mwindow->gui->unlock_window();
 	}
 }
@@ -601,7 +598,7 @@ void VWindowEditing::toggle_label()
 	}
 }
 
-void VWindowEditing::prev_label()
+void VWindowEditing::prev_label(int cut)
 {
 	if(vwindow->get_edl())
 	{
@@ -631,7 +628,7 @@ void VWindowEditing::prev_label()
 	}
 }
 
-void VWindowEditing::next_label()
+void VWindowEditing::next_label(int cut)
 {
 	if(vwindow->get_edl())
 	{
@@ -703,7 +700,7 @@ void VWindowEditing::to_clip()
 {
 	EDL *edl = vwindow->get_edl();
 	if( !edl ) return;
-	mwindow->to_clip(edl, _("viewer window: "));
+	mwindow->to_clip(edl, _("viewer window: "), subwindow->shift_down());
 }
 
 VWindowSource::VWindowSource(MWindow *mwindow, VWindowGUI *vwindow, int x, int y)
@@ -833,14 +830,17 @@ void VWindowCanvas::draw_refresh(int flush)
 		float in_x1, in_y1, in_x2, in_y2;
 		float out_x1, out_y1, out_x2, out_y2;
 		get_transfers(edl,
-			in_x1,
-			in_y1,
-			in_x2,
-			in_y2,
-			out_x1,
-			out_y1,
-			out_x2,
-			out_y2);
+			in_x1, in_y1, in_x2, in_y2,
+			out_x1, out_y1, out_x2, out_y2);
+// input scaled from session to refresh frame coordinates
+		int ow = get_output_w(edl);
+		int oh = get_output_h(edl);
+		int rw = refresh_frame->get_w();
+		int rh = refresh_frame->get_h();
+		float xs = (float)rw / ow;
+		float ys = (float)rh / oh;
+		in_x1 *= xs;  in_x2 *= xs;
+		in_y1 *= ys;  in_y2 *= ys;
 		get_canvas()->draw_vframe(refresh_frame,
 				(int)out_x1,
 				(int)out_y1,
@@ -860,6 +860,12 @@ void VWindowCanvas::draw_refresh(int flush)
 	}
 }
 
+int VWindowCanvas::need_overlays()
+{
+	if( gui->highlighted ) return 1;
+	return 0;
+}
+
 void VWindowCanvas::draw_overlays()
 {
 	if( gui->highlighted )