Session-range behavior (gtk2 part)

  * Both the session-start and session-end point should follow the is-free option
  * Rename the end-is-free option to session-range-is-free, to reflect that change
  * This fixes the problem: recording before the start marker would move the Start,
    even if the user had already fixed the End marker.

3 files changed, 10 insertions, 8 deletions

diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index 0b6b1e34b3..4abcff6141 100644
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -4688,7 +4688,7 @@ MarkerDrag::finished (GdkEvent* event, bool movement_occurred)
 			}
 
 			if (location->is_session_range()) {
-				_editor->session()->set_end_is_free (false);
+				_editor->session()->set_session_range_is_free (false);
 			}
 		}
 	}
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 961b79a6ad..c01a8c5fe9 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -441,7 +441,7 @@ Editor::nudge_forward (bool next, bool force_playhead)
 						loc->set_end (max_samplepos, false, true, divisions);
 					}
 					if (loc->is_session_range()) {
-						_session->set_end_is_free (false);
+						_session->set_session_range_is_free (false);
 					}
 				}
 				if (!in_command) {
@@ -535,7 +535,7 @@ Editor::nudge_backward (bool next, bool force_playhead)
 						loc->set_end (loc->length(), false, true, get_grid_music_divisions(0));
 					}
 					if (loc->is_session_range()) {
-						_session->set_end_is_free (false);
+						_session->set_session_range_is_free (false);
 					}
 				}
 				if (!in_command) {
@@ -2266,6 +2266,8 @@ Editor::set_session_start_from_playhead ()
 
 		commit_reversible_command ();
 	}
+
+	_session->set_session_range_is_free (false);
 }
 
 void
@@ -2291,7 +2293,7 @@ Editor::set_session_end_from_playhead ()
 		commit_reversible_command ();
 	}
 
-	_session->set_end_is_free (false);
+	_session->set_session_range_is_free (false);
 }
 
 
@@ -6600,7 +6602,7 @@ Editor::set_session_extents_from_selection ()
 		commit_reversible_command ();
 	}
 
-	_session->set_end_is_free (false);
+	_session->set_session_range_is_free (false);
 }
 
 void
diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc
index 7f658b9816..306f2ab6d2 100644
--- a/gtk2_ardour/location_ui.cc
+++ b/gtk2_ardour/location_ui.cc
@@ -423,7 +423,7 @@ LocationEditRow::to_playhead_button_pressed (LocationPart part)
 		case LocEnd:
 			location->set_end (_session->transport_sample (), false, true,divisions);
 			if (location->is_session_range()) {
-				_session->set_end_is_free (false);
+				_session->set_session_range_is_free (false);
 			}
 			break;
 		default:
@@ -472,13 +472,13 @@ LocationEditRow::clock_changed (LocationPart part)
 		case LocEnd:
 			location->set_end (end_clock.current_time(), false, true, divisions);
 			if (location->is_session_range()) {
-				_session->set_end_is_free (false);
+				_session->set_session_range_is_free (false);
 			}
 			break;
 		case LocLength:
 			location->set_end (location->start() + length_clock.current_duration(), false, true, divisions);
 			if (location->is_session_range()) {
-				_session->set_end_is_free (false);
+				_session->set_session_range_is_free (false);
 			}
 		default:
 			break;