X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Feditpanel.C;h=c056e2ebbec836635550ebefa9f774a918bed480;hb=74afbc29ac4ce9d94d53e10342979f2c59f1f193;hp=df2e7b1ce4b1c58955c5cb3cb694b046df97a1b7;hpb=b5c58822be78c8820692c916e296a2230bb2b9e2;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/editpanel.C b/cinelerra-5.1/cinelerra/editpanel.C
index df2e7b1c..c056e2eb 100644
--- a/cinelerra-5.1/cinelerra/editpanel.C
+++ b/cinelerra-5.1/cinelerra/editpanel.C
@@ -339,7 +339,7 @@ void EditPanel::toggle_label()
 void EditPanel::prev_label()
 {
 	int shift_down = subwindow->shift_down();
-	int snap = subwindow->ctrl_down() && subwindow->ctrl_down();
+	int snap = subwindow->ctrl_down() && subwindow->alt_down();
 
 	int have_mwindow_lock = mwindow->gui->get_window_lock();
 	int have_subwindow_lock =
@@ -369,7 +369,7 @@ void EditPanel::prev_label()
 void EditPanel::next_label()
 {
 	int shift_down = subwindow->shift_down();
-	int snap = subwindow->ctrl_down() && subwindow->ctrl_down();
+	int snap = subwindow->ctrl_down() && subwindow->alt_down();
 
 	int have_mwindow_lock = mwindow->gui->get_window_lock();
 	int have_subwindow_lock =
@@ -401,7 +401,7 @@ void EditPanel::next_label()
 void EditPanel::prev_edit()
 {
 	int shift_down = subwindow->shift_down();
-	int snap = subwindow->ctrl_down() && subwindow->ctrl_down();
+	int snap = subwindow->ctrl_down() && subwindow->alt_down();
 
 	int have_mwindow_lock = mwindow->gui->get_window_lock();
 	int have_subwindow_lock =
@@ -431,7 +431,7 @@ void EditPanel::prev_edit()
 void EditPanel::next_edit()
 {
 	int shift_down = subwindow->shift_down();
-	int snap = subwindow->ctrl_down() && subwindow->ctrl_down();
+	int snap = subwindow->ctrl_down() && subwindow->alt_down();
 
 	int have_mwindow_lock = mwindow->gui->get_window_lock();
 	int have_subwindow_lock =
@@ -646,14 +646,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);
 }
 
 
@@ -679,6 +674,11 @@ int EditInPoint::keypress_event()
 		panel->set_inpoint();
 		return 1;
 	}
+	if(ctrl_down() && get_keypress() == 't')
+	{
+		panel->unset_inoutpoint();
+		return 1;
+	}
 	return 0;
 }
 
@@ -704,6 +704,11 @@ int EditOutPoint::keypress_event()
 		panel->set_outpoint();
 		return 1;
 	}
+	if(ctrl_down() && get_keypress() == 't')
+	{
+		panel->unset_inoutpoint();
+		return 1;
+	}
 	return 0;
 }