X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fvwindowgui.C;h=e5275cbc1c68900a90dc0a7bb51645d2842c5ada;hp=4458eb764c80ba1bf608fd1e25f80f5284a1c9c4;hb=576087eacf577a0fa5d3008d37c4d5b597f0990a;hpb=60f8df69db9ddd8148bfc41a17bb0955b52a45e6

diff --git a/cinelerra-5.1/cinelerra/vwindowgui.C b/cinelerra-5.1/cinelerra/vwindowgui.C
index 4458eb76..e5275cbc 100644
--- a/cinelerra-5.1/cinelerra/vwindowgui.C
+++ b/cinelerra-5.1/cinelerra/vwindowgui.C
@@ -348,7 +348,8 @@ int VWindowGUI::keypress_event()
 			break;
 	}
 	if(!result) result = transport->keypress_event();
-
+	if( result && !vwindow->playback_engine->is_playing_back )
+		timebar->update(1);
 	return result;
 }
 
@@ -363,15 +364,29 @@ void VWindowGUI::stop_transport(const char *lock_msg)
 
 int VWindowGUI::button_press_event()
 {
-	if( get_buttonpress() == LEFT_BUTTON && canvas->get_canvas() &&
+	if( vwindow->get_edl() != 0 && canvas->get_canvas() &&
 	    canvas->get_canvas()->get_cursor_over_window() ) {
-		PlaybackEngine *playback_engine = vwindow->playback_engine;
-		if( !playback_engine->is_playing_back && vwindow->get_edl() != 0 ) {
-			double length = vwindow->get_edl()->tracks->total_playable_length();
-			double position = playback_engine->get_tracking_position();
-			if( position >= length ) transport->goto_start();
+		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();
 		}
-		return transport->forward_play->handle_event();
 	}
 	if(canvas->get_canvas())
 		return canvas->button_press_event_base(canvas->get_canvas());