X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Feditpanel.C;h=379291413d0eb57561d359bb398aa7e68c4fca97;hp=d140faee0f6d4230e58fe58c13640cbabdda09a4;hb=576087eacf577a0fa5d3008d37c4d5b597f0990a;hpb=078018dae12e5bdfc6c6f00e28a732be06c0e3c9

diff --git a/cinelerra-5.1/cinelerra/editpanel.C b/cinelerra-5.1/cinelerra/editpanel.C
index d140faee..37929141 100644
--- a/cinelerra-5.1/cinelerra/editpanel.C
+++ b/cinelerra-5.1/cinelerra/editpanel.C
@@ -329,6 +329,13 @@ SET_TRACE
 SET_TRACE
 }
 
+void EditPanel::stop_transport(const char *lock_msg)
+{
+	int have_subwindow_lock = subwindow->get_window_lock();
+	if( have_subwindow_lock ) subwindow->unlock_window();
+	mwindow->stop_transport();
+	if( have_subwindow_lock ) subwindow->lock_window(lock_msg);
+}
 
 
 void EditPanel::toggle_label()
@@ -340,29 +347,17 @@ void EditPanel::prev_label()
 {
 	int shift_down = subwindow->shift_down();
 	int snap = subwindow->ctrl_down() && subwindow->alt_down();
-
 	int have_mwindow_lock = mwindow->gui->get_window_lock();
-	int have_subwindow_lock =
-		 subwindow->get_top_level() == mwindow->gui->get_top_level() ?
-			 0 : subwindow->get_window_lock();
-	if(have_mwindow_lock)
-		mwindow->gui->unlock_window();
-	if(have_subwindow_lock)
-		subwindow->unlock_window();
+	if( have_mwindow_lock ) mwindow->gui->unlock_window();
 
-	mwindow->gui->mbuttons->transport->handle_transport(STOP, 1, 0, 0);
-
-	if(have_subwindow_lock)
-		subwindow->lock_window("EditPanel::prev_label 1");
+	stop_transport("EditPanel::prev_label 1");
 
 	mwindow->gui->lock_window("EditPanel::prev_label 2");
-
 	if( snap )
 		mwindow->snap_left_label();
 	else
 		mwindow->prev_label(shift_down);
-
-	if(!have_mwindow_lock)
+	if( !have_mwindow_lock )
 		mwindow->gui->unlock_window();
 }
 
@@ -370,29 +365,17 @@ void EditPanel::next_label()
 {
 	int shift_down = subwindow->shift_down();
 	int snap = subwindow->ctrl_down() && subwindow->alt_down();
-
 	int have_mwindow_lock = mwindow->gui->get_window_lock();
-	int have_subwindow_lock =
-		 subwindow->get_top_level() == mwindow->gui->get_top_level() ?
-			 0 : subwindow->get_window_lock();
-	if(have_mwindow_lock)
-		mwindow->gui->unlock_window();
-	if(have_subwindow_lock)
-		subwindow->unlock_window();
+	if( have_mwindow_lock ) mwindow->gui->unlock_window();
 
-	mwindow->gui->mbuttons->transport->handle_transport(STOP, 1, 0, 0);
-
-	if(have_subwindow_lock)
-		subwindow->lock_window("EditPanel::next_label 1");
+	stop_transport("EditPanel::next_label 1");
 
 	mwindow->gui->lock_window("EditPanel::next_label 2");
-
 	if( snap )
 		mwindow->snap_right_label();
 	else
 		mwindow->next_label(shift_down);
-
-	if(!have_mwindow_lock)
+	if( !have_mwindow_lock )
 		mwindow->gui->unlock_window();
 }
 
@@ -402,20 +385,10 @@ void EditPanel::prev_edit()
 {
 	int shift_down = subwindow->shift_down();
 	int snap = subwindow->ctrl_down() && subwindow->alt_down();
-
 	int have_mwindow_lock = mwindow->gui->get_window_lock();
-	int have_subwindow_lock =
-		 subwindow->get_top_level() == mwindow->gui->get_top_level() ?
-			 0 : subwindow->get_window_lock();
-	if(have_mwindow_lock)
-		mwindow->gui->unlock_window();
-	if(have_subwindow_lock)
-		subwindow->unlock_window();
-
-	mwindow->gui->mbuttons->transport->handle_transport(STOP, 1, 0, 0);
+	if( have_mwindow_lock ) mwindow->gui->unlock_window();
 
-	if(have_subwindow_lock)
-		subwindow->lock_window("EditPanel::prev_edit 1");
+	stop_transport("EditPanel::prev_edit 1");
 
 	mwindow->gui->lock_window("EditPanel::prev_edit 2");
 
@@ -424,7 +397,7 @@ void EditPanel::prev_edit()
 	else
 		mwindow->prev_edit_handle(shift_down);
 
-	if(!have_mwindow_lock)
+	if( !have_mwindow_lock )
 		mwindow->gui->unlock_window();
 }
 
@@ -432,20 +405,10 @@ void EditPanel::next_edit()
 {
 	int shift_down = subwindow->shift_down();
 	int snap = subwindow->ctrl_down() && subwindow->alt_down();
-
 	int have_mwindow_lock = mwindow->gui->get_window_lock();
-	int have_subwindow_lock =
-		 subwindow->get_top_level() == mwindow->gui->get_top_level() ?
-			 0 : subwindow->get_window_lock();
-	if(have_mwindow_lock)
-		mwindow->gui->unlock_window();
-	if(have_subwindow_lock)
-		subwindow->unlock_window();
-
-	mwindow->gui->mbuttons->transport->handle_transport(STOP, 1, 0, 0);
+	if( have_mwindow_lock ) mwindow->gui->unlock_window();
 
-	if(have_subwindow_lock)
-		subwindow->lock_window("EditPanel::next_edit 1");
+	stop_transport("EditPanel::next_edit 1");
 
 	mwindow->gui->lock_window("EditPanel::next_edit 2");
 
@@ -454,7 +417,7 @@ void EditPanel::next_edit()
 	else
 		mwindow->next_edit_handle(shift_down);
 
-	if(!have_mwindow_lock)
+	if( !have_mwindow_lock )
 		mwindow->gui->unlock_window();
 }
 
@@ -646,14 +609,9 @@ void EditPanel::set_outpoint()
 	mwindow->set_outpoint(1);
 }
 
-void EditPanel::clear_inpoint()
+void EditPanel::unset_inoutpoint()
 {
-	mwindow->delete_inpoint();
-}
-
-void EditPanel::clear_outpoint()
-{
-	mwindow->delete_outpoint();
+	mwindow->unset_inoutpoint(1);
 }
 
 
@@ -662,7 +620,7 @@ EditInPoint::EditInPoint(MWindow *mwindow, EditPanel *panel, int x, int y)
 {
 	this->mwindow = mwindow;
 	this->panel = panel;
-	set_tooltip(_("In point ( [ )"));
+	set_tooltip(_("In point ( [ or < )"));
 }
 EditInPoint::~EditInPoint()
 {
@@ -674,9 +632,14 @@ int EditInPoint::handle_event()
 }
 int EditInPoint::keypress_event()
 {
-	if(get_keypress() == '[')
+	int key = get_keypress();
+	if( key == '[' || key == '<' ) {
+                panel->set_inpoint();
+		return 1;
+	}
+	if(ctrl_down() && get_keypress() == 't')
 	{
-		panel->set_inpoint();
+		panel->unset_inoutpoint();
 		return 1;
 	}
 	return 0;
@@ -687,7 +650,7 @@ EditOutPoint::EditOutPoint(MWindow *mwindow, EditPanel *panel, int x, int y)
 {
 	this->mwindow = mwindow;
 	this->panel = panel;
-	set_tooltip(_("Out point ( ] )"));
+	set_tooltip(_("Out point ( ] or > )"));
 }
 EditOutPoint::~EditOutPoint()
 {
@@ -699,11 +662,16 @@ int EditOutPoint::handle_event()
 }
 int EditOutPoint::keypress_event()
 {
-	if(get_keypress() == ']')
-	{
+	int key = get_keypress();
+	if( key == ']' || key == '>' ) {
 		panel->set_outpoint();
 		return 1;
 	}
+	if(ctrl_down() && get_keypress() == 't')
+	{
+		panel->unset_inoutpoint();
+		return 1;
+	}
 	return 0;
 }