X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Fvwindowgui.C;h=ea05537bb7b2ec6e67bdfe08dfd21a685c13f100;hb=7920493569041de2d8c991eb4b04b33d41b70d57;hp=0642dd81f05dbed51e7850ab08ff9adc830fe525;hpb=0513350234a8dcd08e5a0117d5121724ef7b76b6;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/vwindowgui.C b/cinelerra-5.1/cinelerra/vwindowgui.C
index 0642dd81..ea05537b 100644
--- a/cinelerra-5.1/cinelerra/vwindowgui.C
+++ b/cinelerra-5.1/cinelerra/vwindowgui.C
@@ -104,6 +104,7 @@ void VWindowGUI::change_source(EDL *edl, const char *title)
 		sprintf(string, _(PROGRAM_NAME ": Viewer"));
 
 	lock_window("VWindowGUI::change_source");
+	canvas->clear();
 	timebar->update(0);
 	set_title(string);
 	unlock_window();
@@ -353,6 +354,19 @@ int VWindowGUI::keypress_event()
 
 int VWindowGUI::button_press_event()
 {
+	if( get_buttonpress() == LEFT_BUTTON && canvas->get_canvas() &&
+	    canvas->get_canvas()->get_cursor_over_window() ) {
+		PlaybackEngine *playback_engine = vwindow->playback_engine;
+		unlock_window();
+		if( playback_engine->is_playing_back ) {
+			transport->handle_transport(STOP, 1);
+		}
+		else {
+			transport->handle_transport(NORMAL_FWD, 1);
+		}
+		vwindow->gui->lock_window("VWindowEditing::prev_label");
+		return 1;
+	}
 	if(canvas->get_canvas())
 		return canvas->button_press_event_base(canvas->get_canvas());
 	return 0;
@@ -417,6 +431,11 @@ int VWindowGUI::drag_stop()
 		EDL *edl = mwindow->session->drag_clips->size() ?
 			mwindow->session->drag_clips->get(0) :
 			0;
+		if( vwindow->playback_engine->is_playing_back ) {
+			unlock_window();
+			vwindow->stop_playback(1);
+			lock_window("VWindowGUI::drag_stop");
+		}
 
 		if(indexable)
 			vwindow->change_source(indexable);
@@ -640,15 +659,11 @@ void VWindowEditing::set_outpoint()
 	vwindow->set_outpoint();
 }
 
-void VWindowEditing::clear_inpoint()
+void VWindowEditing::unset_inoutpoint()
 {
-	vwindow->clear_inpoint();
+	vwindow->unset_inoutpoint();
 }
 
-void VWindowEditing::clear_outpoint()
-{
-	vwindow->clear_outpoint();
-}
 
 void VWindowEditing::to_clip()
 {