Fix up state save/load of location lock/glue settings.

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

diff --git a/libs/ardour/location.cc b/libs/ardour/location.cc
index 5828c57f65149fc96418831147fdf0d4007a2c80..d9d5911555c612dcce670367afd78ccf3a3ce308 100644 (file)
--- a/libs/ardour/location.cc
+++ b/libs/ardour/location.cc
@@ -357,6 +357,7 @@ Location::get_state ()
        node->add_property ("end", buf);
        node->add_property ("flags", enum_2_string (_flags));
        node->add_property ("locked", (_locked ? "yes" : "no"));
+       node->add_property ("position-lock-style", enum_2_string (_position_lock_style));
 
        return *node;
 }
@@ -427,24 +428,27 @@ Location::set_state (const XMLNode& node, int /*version*/)
                  cd_node = *cd_iter;
 
                  if (cd_node->name() != "CD-Info") {
-                   continue;
+                         continue;
                  }
 
                  if ((prop = cd_node->property ("name")) != 0) {
-                   cd_name = prop->value();
+                         cd_name = prop->value();
                  } else {
-                   throw failed_constructor ();
+                         throw failed_constructor ();
                  }
 
                  if ((prop = cd_node->property ("value")) != 0) {
-                   cd_value = prop->value();
+                         cd_value = prop->value();
                  } else {
-                   throw failed_constructor ();
+                         throw failed_constructor ();
                  }
 
 
                  cd_info[cd_name] = cd_value;
+       }
 
+       if ((prop = node.property ("position-lock-style")) != 0) {
+               _position_lock_style = PositionLockStyle (string_2_enum (prop->value(), _position_lock_style));
        }
 
        recompute_bbt_from_frames ();
@@ -464,6 +468,8 @@ Location::set_position_lock_style (PositionLockStyle ps)
        _position_lock_style = ps;
 
        recompute_bbt_from_frames ();
+
+       PositionLockStyleChanged (this); /* EMIT SIGNAL */
 }
 
 void
@@ -488,6 +494,20 @@ Location::recompute_frames_from_bbt ()
        set (map.frame_time (_bbt_start), map.frame_time (_bbt_end), false);
 }
 
+void
+Location::lock ()
+{
+       _locked = true;
+       LockChanged (this);
+}
+
+void
+Location::unlock ()
+{
+       _locked = false;
+       LockChanged (this);
+}
+
 /*---------------------------------------------------------------------- */
 
 Locations::Locations (Session& s)