First stage of options rework.

- Split Configuration into RCConfiguration and SessionConfiguration;
the first for options which are saved to .rc files and the second
for options which are saved in a session file.

- Move some options from the old `master' Configuration object into
SessionConfiguration; this needs more refinement.

- Reflect many RCConfiguration options in an expanded Edit->Preferences
dialog; my intention is to remove the corresponding menu items
eventually.



git-svn-id: svn://localhost/ardour2/branches/3.0@5075 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 7 insertions, 8 deletions

diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc
index a78addf481..4942485a70 100644
--- a/libs/ardour/playlist.cc
+++ b/libs/ardour/playlist.cc
@@ -421,8 +421,7 @@ Playlist::flush_notifications ()
 	// pending_bounds.sort (cmp);
 
 	for (RegionList::iterator r = pending_bounds.begin(); r != pending_bounds.end(); ++r) {
-
-		if (Config->get_layer_model() == MoveAddHigher) {
+		if (_session.config.get_layer_model() == MoveAddHigher) {
 			timestamp_layer_op (*r);
 		}
 
@@ -1277,7 +1276,7 @@ Playlist::region_bounds_changed (Change what_changed, boost::shared_ptr<Region>
 		if (holding_state ()) {
 			pending_bounds.push_back (region);
 		} else {
-			if (Config->get_layer_model() == MoveAddHigher) {
+			if (_session.config.get_layer_model() == MoveAddHigher) {
 				/* it moved or changed length, so change the timestamp */
 				timestamp_layer_op (region);
 			}
@@ -1964,7 +1963,7 @@ Playlist::relayer ()
 
 	/* sort according to the model */
 
-	if (Config->get_layer_model() == MoveAddHigher || Config->get_layer_model() == AddHigher) {
+	if (_session.config.get_layer_model() == MoveAddHigher || _session.config.get_layer_model() == AddHigher) {
 		RegionSortByLastLayerOp cmp;
 		copy.sort (cmp);
 	}
@@ -2054,8 +2053,8 @@ void
 Playlist::raise_region_to_top (boost::shared_ptr<Region> region)
 {
 	/* does nothing useful if layering mode is later=higher */
-	if ((Config->get_layer_model() == MoveAddHigher) ||
-	    (Config->get_layer_model() == AddHigher)) {
+	if ((_session.config.get_layer_model() == MoveAddHigher) ||
+	    (_session.config.get_layer_model() == AddHigher)) {
 		timestamp_layer_op (region);
 		relayer ();
 	}
@@ -2065,8 +2064,8 @@ void
 Playlist::lower_region_to_bottom (boost::shared_ptr<Region> region)
 {
 	/* does nothing useful if layering mode is later=higher */
-	if ((Config->get_layer_model() == MoveAddHigher) ||
-	    (Config->get_layer_model() == AddHigher)) {
+	if ((_session.config.get_layer_model() == MoveAddHigher) ||
+	    (_session.config.get_layer_model() == AddHigher)) {
 		region->set_last_layer_op (0);
 		relayer ();
 	}