X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fvwindowgui.C;h=db6312bcacba94ce3a2eb404de726eaa490feb38;hb=3594cc12d62e8bf2c92e4e897aaf130645cbbc56;hp=ea05537bb7b2ec6e67bdfe08dfd21a685c13f100;hpb=7920493569041de2d8c991eb4b04b33d41b70d57;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/vwindowgui.C b/cinelerra-5.1/cinelerra/vwindowgui.C
index ea05537b..db6312bc 100644
--- a/cinelerra-5.1/cinelerra/vwindowgui.C
+++ b/cinelerra-5.1/cinelerra/vwindowgui.C
@@ -348,24 +348,43 @@ int VWindowGUI::keypress_event()
 			break;
 	}
 	if(!result) result = transport->keypress_event();
-
 	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( 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;
-		unlock_window();
-		if( playback_engine->is_playing_back ) {
-			transport->handle_transport(STOP, 1);
-		}
-		else {
-			transport->handle_transport(NORMAL_FWD, 1);
+		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();
 		}
-		vwindow->gui->lock_window("VWindowEditing::prev_label");
-		return 1;
 	}
 	if(canvas->get_canvas())
 		return canvas->button_press_event_base(canvas->get_canvas());
@@ -424,6 +443,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) :
@@ -431,17 +451,12 @@ 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);
 		else
 		if(edl)
 			vwindow->change_source(edl);
+		lock_window("VWindowGUI::drag_stop");
 		return 1;
 	}