fixes for 98% of all the warnings/errors reported by OS X gcc on tiger

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

diff --git a/libs/ardour/location.cc b/libs/ardour/location.cc
index 7dce787b6099d5026fb1d7eb0478994ccf999e25..b6a09d863ab189a5e3ea1a84209c6ad4ad02f366 100644 (file)
--- a/libs/ardour/location.cc
+++ b/libs/ardour/location.cc
@@ -50,9 +50,11 @@ Location::Location (Session& s)
        , _locked (false)
        , _position_lock_style (AudioTime)
 {
-
+       assert (_start >= 0);
+       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)
@@ -60,9 +62,12 @@ 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 ();
+
+       assert (_start >= 0);
+       assert (_end >= 0);
 }
 
 Location::Location (const Location& other)
@@ -79,6 +84,9 @@ Location::Location (const Location& other)
        /* copy is not locked even if original was */
 
        _locked = false;
+
+       assert (_start >= 0);
+       assert (_end >= 0);
 }
 
 Location::Location (Session& s, const XMLNode& node)
@@ -88,10 +96,13 @@ 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 ();
        }
+
+       assert (_start >= 0);
+       assert (_end >= 0);
 }
 
 Location*
@@ -115,6 +126,9 @@ Location::operator= (const Location& other)
 
        /* "changed" not emitted on purpose */
 
+       assert (_start >= 0);
+       assert (_end >= 0);
+
        return this;
 }
 
@@ -143,16 +157,21 @@ Location::set_start (framepos_t s, bool force, bool allow_bbt_recompute)
                        if (allow_bbt_recompute) {
                                recompute_bbt_from_frames ();
                        }
+
                        start_changed (this); /* EMIT SIGNAL */
                        end_changed (this); /* EMIT SIGNAL */
                }
+
+               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 ();
@@ -164,6 +183,8 @@ Location::set_start (framepos_t s, bool force, bool allow_bbt_recompute)
                }
        }
 
+       assert (_start >= 0);
+
        return 0;
 }
 
@@ -184,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;
@@ -195,12 +216,16 @@ Location::set_end (framepos_t e, bool force, bool allow_bbt_recompute)
                        start_changed (this); /* EMIT SIGNAL */
                        end_changed (this); /* EMIT SIGNAL */
                }
+
+               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 ();
@@ -212,6 +237,8 @@ Location::set_end (framepos_t e, bool force, bool allow_bbt_recompute)
                }
        }
 
+       assert (_end >= 0);
+
        return 0;
 }
 
@@ -245,6 +272,9 @@ Location::move_to (framepos_t pos)
                changed (this); /* EMIT SIGNAL */
        }
 
+       assert (_start >= 0);
+       assert (_end >= 0);
+
        return 0;
 }
 
@@ -465,6 +495,9 @@ Location::set_state (const XMLNode& node, int /*version*/)
 
        changed (this); /* EMIT SIGNAL */
 
+       assert (_start >= 0);
+       assert (_end >= 0);
+
        return 0;
 }
 
@@ -488,7 +521,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);
 }
@@ -678,7 +711,7 @@ void
 Locations::add (Location *loc, bool make_current)
 {
        assert (loc);
-       
+
        {
                Glib::Mutex::Lock lm (lock);
                locations.push_back (loc);
@@ -769,13 +802,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);
        }
 
        {
@@ -786,7 +821,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;
 
@@ -818,7 +869,7 @@ Locations::set_state (const XMLNode& node, int version)
                                }
 
                                if (add) {
-                                       locations.push_back (loc);
+                                       new_locations.push_back (loc);
                                }
                        }
 
@@ -827,6 +878,8 @@ Locations::set_state (const XMLNode& node, int version)
                        }
                }
 
+               locations = new_locations;
+
                if (locations.size()) {
                        current_location = locations.front();
                } else {
@@ -918,7 +971,7 @@ void
 Locations::marks_either_side (framepos_t const frame, framepos_t& before, framepos_t& after) const
 {
        before = after = max_framepos;
-       
+
        LocationList locs;
 
        {
@@ -927,7 +980,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) {
@@ -974,7 +1027,7 @@ Locations::marks_either_side (framepos_t const frame, framepos_t& before, framep
                /* none before */
                return;
        }
-       
+
        --i;
        before = *i;
 }