X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_actions.cc;h=423a9ad1a148fede8691a7521265401051f2178a;hb=cd68ae78f9b56269a042939658adf0f73f0210a5;hp=8b4ec4034a861b590937f096f4ba259afd913452;hpb=300b484cf6ac14c15e365c4062345d64a61c4b18;p=ardour.git

diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index 8b4ec4034a..423a9ad1a1 100644
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -1146,94 +1146,94 @@ Editor::prev_snap_choice ()
 {
 	switch (_snap_type) {
 	case Editing::SnapToCDFrame:
-		set_snap_to (Editing::SnapToTimecodeFrame);
+		set_snap_to (Editing::SnapToRegionBoundary);
 		break;
 	case Editing::SnapToTimecodeFrame:
-		set_snap_to (Editing::SnapToTimecodeSeconds);
+		set_snap_to (Editing::SnapToCDFrame);
 		break;
 	case Editing::SnapToTimecodeSeconds:
-		set_snap_to (Editing::SnapToTimecodeMinutes);
+		set_snap_to (Editing::SnapToTimecodeFrame);
 		break;
 	case Editing::SnapToTimecodeMinutes:
-		set_snap_to (Editing::SnapToSeconds);
+		set_snap_to (Editing::SnapToTimecodeSeconds);
 		break;
 	case Editing::SnapToSeconds:
-		set_snap_to (Editing::SnapToMinutes);
+		set_snap_to (Editing::SnapToTimecodeMinutes);
 		break;
 	case Editing::SnapToMinutes:
-		set_snap_to (Editing::SnapToBeatDiv128);
+		set_snap_to (Editing::SnapToSeconds);
 		break;
 	case Editing::SnapToBeatDiv128:
-		set_snap_to (Editing::SnapToBeatDiv64);
+		set_snap_to (Editing::SnapToMinutes);
 		break;
 	case Editing::SnapToBeatDiv64:
-		set_snap_to (Editing::SnapToBeatDiv32);
+		set_snap_to (Editing::SnapToBeatDiv128);
 		break;
 	case Editing::SnapToBeatDiv32:
-		set_snap_to (Editing::SnapToBeatDiv28);
+		set_snap_to (Editing::SnapToBeatDiv64);
 		break;
 	case Editing::SnapToBeatDiv28:
-		set_snap_to (Editing::SnapToBeatDiv24);
+		set_snap_to (Editing::SnapToBeatDiv32);
 		break;
 	case Editing::SnapToBeatDiv24:
-		set_snap_to (Editing::SnapToBeatDiv20);
+		set_snap_to (Editing::SnapToBeatDiv28);
 		break;
 	case Editing::SnapToBeatDiv20:
-		set_snap_to (Editing::SnapToBeatDiv16);
+		set_snap_to (Editing::SnapToBeatDiv24);
 		break;
 	case Editing::SnapToBeatDiv16:
-		set_snap_to (Editing::SnapToBeatDiv14);
+		set_snap_to (Editing::SnapToBeatDiv20);
 		break;
 	case Editing::SnapToBeatDiv14:
-		set_snap_to (Editing::SnapToBeatDiv12);
+		set_snap_to (Editing::SnapToBeatDiv16);
 		break;
 	case Editing::SnapToBeatDiv12:
-		set_snap_to (Editing::SnapToBeatDiv10);
+		set_snap_to (Editing::SnapToBeatDiv14);
 		break;
 	case Editing::SnapToBeatDiv10:
-		set_snap_to (Editing::SnapToBeatDiv8);
+		set_snap_to (Editing::SnapToBeatDiv12);
 		break;
 	case Editing::SnapToBeatDiv8:
-		set_snap_to (Editing::SnapToBeatDiv7);
+		set_snap_to (Editing::SnapToBeatDiv10);
 		break;
 	case Editing::SnapToBeatDiv7:
-		set_snap_to (Editing::SnapToBeatDiv6);
+		set_snap_to (Editing::SnapToBeatDiv8);
 		break;
 	case Editing::SnapToBeatDiv6:
-		set_snap_to (Editing::SnapToBeatDiv5);
+		set_snap_to (Editing::SnapToBeatDiv7);
 		break;
 	case Editing::SnapToBeatDiv5:
-		set_snap_to (Editing::SnapToBeatDiv4);
+		set_snap_to (Editing::SnapToBeatDiv6);
 		break;
 	case Editing::SnapToBeatDiv4:
-		set_snap_to (Editing::SnapToBeatDiv3);
+		set_snap_to (Editing::SnapToBeatDiv5);
 		break;
 	case Editing::SnapToBeatDiv3:
-		set_snap_to (Editing::SnapToBeatDiv2);
+		set_snap_to (Editing::SnapToBeatDiv4);
 		break;
 	case Editing::SnapToBeatDiv2:
-		set_snap_to (Editing::SnapToBeat);
+		set_snap_to (Editing::SnapToBeatDiv3);
 		break;
 	case Editing::SnapToBeat:
-		set_snap_to (Editing::SnapToBar);
+		set_snap_to (Editing::SnapToBeatDiv2);
 		break;
 	case Editing::SnapToBar:
-		set_snap_to (Editing::SnapToMark);
+		set_snap_to (Editing::SnapToBeat);
 		break;
 	case Editing::SnapToMark:
-		set_snap_to (Editing::SnapToRegionStart);
+		set_snap_to (Editing::SnapToBar);
 		break;
 	case Editing::SnapToRegionStart:
-		set_snap_to (Editing::SnapToRegionEnd);
+		set_snap_to (Editing::SnapToMark);
 		break;
 	case Editing::SnapToRegionEnd:
-		set_snap_to (Editing::SnapToRegionSync);
+		set_snap_to (Editing::SnapToRegionStart);
 		break;
 	case Editing::SnapToRegionSync:
-		set_snap_to (Editing::SnapToRegionBoundary);
+		set_snap_to (Editing::SnapToRegionEnd);
 		break;
 	case Editing::SnapToRegionBoundary:
-		set_snap_to (Editing::SnapToCDFrame);
+		set_snap_to (Editing::SnapToRegionSync);
 		break;
 	}
 }
@@ -1600,11 +1600,11 @@ Editor::parameter_changed (std::string p)
 	ENSURE_GUI_THREAD (*this, &Editor::parameter_changed, p)
 
 	if (p == "auto-loop") {
-		update_loop_range_view (true);
+		update_loop_range_view ();
 	} else if (p == "punch-in") {
-		update_punch_range_view (true);
+		update_punch_range_view ();
 	} else if (p == "punch-out") {
-		update_punch_range_view (true);
+		update_punch_range_view ();
 	} else if (p == "timecode-format") {
 		update_just_timecode ();
 	} else if (p == "show-region-fades") {