X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcwindowgui.C;h=da38d010ef2d36baea86effe871926a2d64d371f;hp=1c56a6d641e3b70f3f737906fe8c6d794d4a7884;hb=60f8df69db9ddd8148bfc41a17bb0955b52a45e6;hpb=8ab335aafbd648cad728f18e01153715a4e59eef

diff --git a/cinelerra-5.1/cinelerra/cwindowgui.C b/cinelerra-5.1/cinelerra/cwindowgui.C
index 1c56a6d6..da38d010 100644
--- a/cinelerra-5.1/cinelerra/cwindowgui.C
+++ b/cinelerra-5.1/cinelerra/cwindowgui.C
@@ -473,58 +473,34 @@ int CWindowGUI::keypress_event()
 			lock_window("CWindowGUI::keypress_event 4");
 			break;
 		case LEFT:
-			if(!ctrl_down())
-			{
-				if (alt_down())
-				{
-					int shift_down = this->shift_down();
-					unlock_window();
-					mwindow->gui->mbuttons->transport->handle_transport(STOP, 1, 0, 0);
-
-					mwindow->gui->lock_window("CWindowGUI::keypress_event 2");
+			if( !ctrl_down() ) {
+				int alt_down = this->alt_down();
+				int shift_down = this->shift_down();
+				unlock_window();
+				stop_transport(0);
+				mwindow->gui->lock_window("CWindowGUI::keypress_event 2");
+				if( alt_down )
 					mwindow->prev_edit_handle(shift_down);
-					mwindow->gui->unlock_window();
-
-					lock_window("CWindowGUI::keypress_event 1");
-				}
 				else
-				{
-					unlock_window();
-
-					mwindow->gui->lock_window("CWindowGUI::keypress_event 3");
 					mwindow->move_left();
-					mwindow->gui->unlock_window();
-
-					lock_window("CWindowGUI::keypress_event 2");
-				}
+				mwindow->gui->unlock_window();
+				lock_window("CWindowGUI::keypress_event 2");
  				result = 1;
 			}
 			break;
 		case RIGHT:
-			if(!ctrl_down())
-			{
-				if (alt_down())
-				{
-					int shift_down = this->shift_down();
-					unlock_window();
-					mwindow->gui->mbuttons->transport->handle_transport(STOP, 1, 0, 0);
-
-					mwindow->gui->lock_window("CWindowGUI::keypress_event 2");
+			if( !ctrl_down() ) {
+				int alt_down = this->alt_down();
+				int shift_down = this->shift_down();
+				unlock_window();
+				stop_transport(0);
+				mwindow->gui->lock_window("CWindowGUI::keypress_event 2");
+				if( alt_down )
 					mwindow->next_edit_handle(shift_down);
-					mwindow->gui->unlock_window();
-
-					lock_window("CWindowGUI::keypress_event 2");
-				}
 				else
-				{
-					unlock_window();
-
-					mwindow->gui->lock_window("CWindowGUI::keypress_event 4");
 					mwindow->move_right();
-					mwindow->gui->unlock_window();
-
-					lock_window("CWindowGUI::keypress_event 3");
-				}
+				mwindow->gui->unlock_window();
+				lock_window("CWindowGUI::keypress_event 2");
 				result = 1;
 			}
 			break;
@@ -676,6 +652,13 @@ void CWindowGUI::update_meters()
 	}
 }
 
+void CWindowGUI::stop_transport(const char *lock_msg)
+{
+	if( lock_msg ) unlock_window();
+	mwindow->stop_transport();
+	if( lock_msg ) lock_window(lock_msg);
+}
+
 
 CWindowEditing::CWindowEditing(MWindow *mwindow, CWindow *cwindow)
  : EditPanel(mwindow,