Remove unused declaration.

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

diff --git a/libs/ardour/location.cc b/libs/ardour/location.cc
index 4f90b322826974b67307a18678d643042090a490..ed9f34ff8bc147798abe76b25ae2bc3bf8cb96cd 100644 (file)
--- a/libs/ardour/location.cc
+++ b/libs/ardour/location.cc
@@ -54,6 +54,7 @@ Location::Location (Session& s)
        assert (_end >= 0);
 }
 
+/** Construct a new Location, giving it the position lock style determined by glue-new-markers-to-bars-and-beats */
 Location::Location (Session& s, framepos_t sample_start, framepos_t sample_end, const std::string &name, Flags bits)
        : SessionHandleRef (s)
        , _name (name)
@@ -61,7 +62,7 @@ Location::Location (Session& s, framepos_t sample_start, framepos_t sample_end,
        , _end (sample_end)
        , _flags (bits)
        , _locked (false)
-       , _position_lock_style (AudioTime)
+       , _position_lock_style (s.config.get_glue_new_markers_to_bars_and_beats() ? MusicTime : AudioTime)
 {
        recompute_bbt_from_frames ();
 
@@ -95,7 +96,7 @@ Location::Location (Session& s, const XMLNode& node)
        /* Note: _position_lock_style is initialised above in case set_state doesn't set it
           (for 2.X session file compatibility).
        */
-       
+
        if (set_state (node, Stateful::loading_state_version)) {
                throw failed_constructor ();
        }
@@ -163,14 +164,14 @@ Location::set_start (framepos_t s, bool force, bool allow_bbt_recompute)
 
                assert (_start >= 0);
                assert (_end >= 0);
-               
+
                return 0;
        }
-       
+
        if (s != _start) {
 
                framepos_t const old = _start;
-               
+
                _start = s;
                if (allow_bbt_recompute) {
                        recompute_bbt_from_frames ();
@@ -183,7 +184,7 @@ Location::set_start (framepos_t s, bool force, bool allow_bbt_recompute)
        }
 
        assert (_start >= 0);
-       
+
        return 0;
 }
 
@@ -204,7 +205,7 @@ Location::set_end (framepos_t e, bool force, bool allow_bbt_recompute)
                        return -1;
                }
        }
-       
+
        if (is_mark()) {
                if (_start != e) {
                        _start = e;
@@ -218,13 +219,13 @@ Location::set_end (framepos_t e, bool force, bool allow_bbt_recompute)
 
                assert (_start >= 0);
                assert (_end >= 0);
-               
+
                return 0;
        }
 
        if (e != _end) {
                framepos_t const old = _end;
-               
+
                _end = e;
                if (allow_bbt_recompute) {
                        recompute_bbt_from_frames ();
@@ -418,10 +419,8 @@ Location::set_state (const XMLNode& node, int /*version*/)
                return -1;
        }
 
-       if ((prop = node.property ("id")) == 0) {
+       if (!set_id (node)) {
                warning << _("XML node for Location has no ID information") << endmsg;
-       } else {
-               _id = prop->value ();
        }
 
        if ((prop = node.property ("name")) == 0) {
@@ -520,7 +519,7 @@ Location::recompute_bbt_from_frames ()
        if (_position_lock_style != MusicTime) {
                return;
        }
-       
+
        _session.tempo_map().bbt_time (_start, _bbt_start);
        _session.tempo_map().bbt_time (_end, _bbt_end);
 }
@@ -710,7 +709,7 @@ void
 Locations::add (Location *loc, bool make_current)
 {
        assert (loc);
-       
+
        {
                Glib::Mutex::Lock lm (lock);
                locations.push_back (loc);
@@ -801,13 +800,15 @@ Locations::set_state (const XMLNode& node, int version)
 
        XMLNodeList nlist = node.children();
 
-       locations.clear ();
+       /* build up a new locations list in here */
+       LocationList new_locations;
+
        current_location = 0;
 
        Location* session_range_location = 0;
        if (version < 3000) {
                session_range_location = new Location (_session, 0, 0, _("session"), Location::IsSessionRange);
-               locations.push_back (session_range_location);
+               new_locations.push_back (session_range_location);
        }
 
        {
@@ -818,7 +819,23 @@ Locations::set_state (const XMLNode& node, int version)
 
                        try {
 
-                               Location *loc = new Location (_session, **niter);
+                               XMLProperty const * prop_id = (*niter)->property ("id");
+                               assert (prop_id);
+                               PBD::ID id (prop_id->value ());
+
+                               LocationList::const_iterator i = locations.begin();
+                               while (i != locations.end () && (*i)->id() != id) {
+                                       ++i;
+                               }
+
+                               Location* loc;
+                               if (i != locations.end()) {
+                                       /* we can re-use an old Location object */
+                                       loc = *i;
+                                       loc->set_state (**niter, version);
+                               } else {
+                                       loc = new Location (_session, **niter);
+                               }
 
                                bool add = true;
 
@@ -850,7 +867,7 @@ Locations::set_state (const XMLNode& node, int version)
                                }
 
                                if (add) {
-                                       locations.push_back (loc);
+                                       new_locations.push_back (loc);
                                }
                        }
 
@@ -859,6 +876,8 @@ Locations::set_state (const XMLNode& node, int version)
                        }
                }
 
+               locations = new_locations;
+
                if (locations.size()) {
                        current_location = locations.front();
                } else {
@@ -950,7 +969,7 @@ void
 Locations::marks_either_side (framepos_t const frame, framepos_t& before, framepos_t& after) const
 {
        before = after = max_framepos;
-       
+
        LocationList locs;
 
        {
@@ -959,7 +978,7 @@ Locations::marks_either_side (framepos_t const frame, framepos_t& before, framep
        }
 
        /* Get a list of positions; don't store any that are exactly on our requested position */
-       
+
        std::list<framepos_t> positions;
 
        for (LocationList::const_iterator i = locs.begin(); i != locs.end(); ++i) {
@@ -1006,7 +1025,7 @@ Locations::marks_either_side (framepos_t const frame, framepos_t& before, framep
                /* none before */
                return;
        }
-       
+
        --i;
        before = *i;
 }