X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fvwindowgui.C;h=e5275cbc1c68900a90dc0a7bb51645d2842c5ada;hb=576087eacf577a0fa5d3008d37c4d5b597f0990a;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..e5275cbc 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();
@@ -347,12 +348,46 @@ int VWindowGUI::keypress_event()
 			break;
 	}
 	if(!result) result = transport->keypress_event();
-
+	if( result && !vwindow->playback_engine->is_playing_back )
+		timebar->update(1);
 	return result;
 }
 
+void VWindowGUI::stop_transport(const char *lock_msg)
+{
+	if( !transport->is_stopped() ) {
+		if( lock_msg ) unlock_window();
+		transport->handle_transport(STOP, 1, 0, 0);
+		if( lock_msg ) lock_window(lock_msg);
+	}
+}
+
 int VWindowGUI::button_press_event()
 {
+	if( vwindow->get_edl() != 0 && canvas->get_canvas() &&
+	    canvas->get_canvas()->get_cursor_over_window() ) {
+		switch( get_buttonpress() ) {
+		case LEFT_BUTTON:
+			if( !vwindow->playback_engine->is_playing_back ) {
+				double length = vwindow->get_edl()->tracks->total_playable_length();
+				double position = vwindow->playback_engine->get_tracking_position();
+				if( position >= length ) transport->goto_start();
+			}
+			return transport->forward_play->handle_event();
+		case MIDDLE_BUTTON:
+			if( !vwindow->playback_engine->is_playing_back ) {
+				double position = vwindow->playback_engine->get_tracking_position();
+				if( position <= 0 ) transport->goto_end();
+			}
+			return transport->reverse_play->handle_event();
+		case RIGHT_BUTTON:  // activates popup
+			break;
+		case WHEEL_UP:
+			return transport->frame_forward_play->handle_event();
+		case WHEEL_DOWN:
+			return transport->frame_reverse_play->handle_event();
+		}
+	}
 	if(canvas->get_canvas())
 		return canvas->button_press_event_base(canvas->get_canvas());
 	return 0;
@@ -410,6 +445,7 @@ int VWindowGUI::drag_stop()
 	{
 		highlighted = 0;
 		canvas->draw_refresh();
+		unlock_window();
 
 		Indexable *indexable = mwindow->session->drag_assets->size() ?
 			mwindow->session->drag_assets->get(0) :
@@ -417,12 +453,12 @@ int VWindowGUI::drag_stop()
 		EDL *edl = mwindow->session->drag_clips->size() ?
 			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;
 	}
 
@@ -640,15 +676,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()
 {