the BIG CONFIG patch

[ardour.git] / libs / ardour / playlist.cc

diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc
index eca7b67e38d1b7e20e5419a96bf216fe6b7abec9..776af75a36a5913b19c80d2ca063988eff669b30 100644 (file)
--- a/libs/ardour/playlist.cc
+++ b/libs/ardour/playlist.cc
@@ -232,7 +232,7 @@ Playlist::init (bool hide)
        _splicing = false;
        _nudging = false;
        in_set_state = false;
-       _edit_mode = _session.get_edit_mode();
+       _edit_mode = Config->get_edit_mode();
        in_flush = false;
        in_partition = false;
        subcnt = 0;
@@ -394,7 +394,7 @@ Playlist::flush_notifications ()
        // pending_bounds.sort (cmp);
 
        for (RegionList::iterator r = pending_bounds.begin(); r != pending_bounds.end(); ++r) {
-               if (_session.get_layer_model() == Session::MoveAddHigher) {
+               if (Config->get_layer_model() == MoveAddHigher) {
                        timestamp_layer_op (*r);
                }
                pending_length = true;
@@ -1134,7 +1134,7 @@ Playlist::region_bounds_changed (Change what_changed, boost::shared_ptr<Region>
                if (holding_state ()) {
                        pending_bounds.push_back (region);
                } else {
-                       if (_session.get_layer_model() == Session::MoveAddHigher) {
+                       if (Config->get_layer_model() == MoveAddHigher) {
                                /* it moved or changed length, so change the timestamp */
                                timestamp_layer_op (region);
                        }
@@ -1537,8 +1537,8 @@ Playlist::relayer ()
 
        freeze ();
 
-       if (_session.get_layer_model() == Session::MoveAddHigher || 
-           _session.get_layer_model() == Session::AddHigher) {
+       if (Config->get_layer_model() == MoveAddHigher || 
+           Config->get_layer_model() == AddHigher) {
 
                RegionSortByLastLayerOp cmp;
                RegionList copy = regions;
@@ -1604,8 +1604,8 @@ void
 Playlist::raise_region_to_top (boost::shared_ptr<Region> region)
 {
        /* does nothing useful if layering mode is later=higher */
-       if ((_session.get_layer_model() == Session::MoveAddHigher) ||
-           (_session.get_layer_model() == Session::AddHigher)) {
+       if ((Config->get_layer_model() == MoveAddHigher) ||
+           (Config->get_layer_model() == AddHigher)) {
                timestamp_layer_op (region);
                relayer ();
        }
@@ -1615,8 +1615,8 @@ void
 Playlist::lower_region_to_bottom (boost::shared_ptr<Region> region)
 {
        /* does nothing useful if layering mode is later=higher */
-       if ((_session.get_layer_model() == Session::MoveAddHigher) ||
-           (_session.get_layer_model() == Session::AddHigher)) {
+       if ((Config->get_layer_model() == MoveAddHigher) ||
+           (Config->get_layer_model() == AddHigher)) {
                region->set_last_layer_op (0);
                relayer ();
        }