X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Flocation.cc;h=2a27fc318a9d986a3afc00fdda2f5082fee1d98d;hb=ef0c4ed0e6907ff7cc0c9f139495619a9f242ff5;hp=7dce787b6099d5026fb1d7eb0478994ccf999e25;hpb=dd7258b29fe46722b1d62560c34c57d62154cb36;p=ardour.git diff --git a/libs/ardour/location.cc b/libs/ardour/location.cc index 7dce787b60..2a27fc318a 100644 --- 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,28 @@ 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); +} + +bool +Location::operator== (const Location& other) +{ + if (_name != other._name || + _start != other._start || + _end != other._end || + _bbt_start != other._bbt_start || + _bbt_end != other._bbt_end || + _flags != other._flags || + _position_lock_style != other._position_lock_style) { + return false; + } + return true; } Location* @@ -115,6 +141,9 @@ Location::operator= (const Location& other) /* "changed" not emitted on purpose */ + assert (_start >= 0); + assert (_end >= 0); + return this; } @@ -126,6 +155,10 @@ Location::operator= (const Location& other) int Location::set_start (framepos_t s, bool force, bool allow_bbt_recompute) { + if (s < 0) { + return -1; + } + if (_locked) { return -1; } @@ -143,16 +176,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 +202,8 @@ Location::set_start (framepos_t s, bool force, bool allow_bbt_recompute) } } + assert (_start >= 0); + return 0; } @@ -175,6 +215,10 @@ Location::set_start (framepos_t s, bool force, bool allow_bbt_recompute) int Location::set_end (framepos_t e, bool force, bool allow_bbt_recompute) { + if (e < 0) { + return -1; + } + if (_locked) { return -1; } @@ -184,7 +228,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 +239,17 @@ 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,12 +261,18 @@ Location::set_end (framepos_t e, bool force, bool allow_bbt_recompute) } } + assert (_end >= 0); + return 0; } int Location::set (framepos_t start, framepos_t end, bool allow_bbt_recompute) { + if (start < 0 || end < 0) { + return -1; + } + /* check validity */ if (((is_auto_punch() || is_auto_loop()) && start >= end) || (!is_mark() && start > end)) { return -1; @@ -233,6 +288,10 @@ Location::set (framepos_t start, framepos_t end, bool allow_bbt_recompute) int Location::move_to (framepos_t pos) { + if (pos < 0) { + return -1; + } + if (_locked) { return -1; } @@ -245,6 +304,9 @@ Location::move_to (framepos_t pos) changed (this); /* EMIT SIGNAL */ } + assert (_start >= 0); + assert (_end >= 0); + return 0; } @@ -389,10 +451,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) { @@ -465,6 +525,9 @@ Location::set_state (const XMLNode& node, int /*version*/) changed (this); /* EMIT SIGNAL */ + assert (_start >= 0); + assert (_end >= 0); + return 0; } @@ -488,9 +551,9 @@ 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); + + _session.bbt_time (_start, _bbt_start); + _session.bbt_time (_end, _bbt_end); } void @@ -542,7 +605,7 @@ Locations::set_current (Location *loc, bool want_lock) int ret; if (want_lock) { - Glib::Mutex::Lock lm (lock); + Glib::Threads::Mutex::Lock lm (lock); ret = set_current_unlocked (loc); } else { ret = set_current_unlocked (loc); @@ -604,7 +667,7 @@ void Locations::clear () { { - Glib::Mutex::Lock lm (lock); + Glib::Threads::Mutex::Lock lm (lock); for (LocationList::iterator i = locations.begin(); i != locations.end(); ) { @@ -629,7 +692,7 @@ void Locations::clear_markers () { { - Glib::Mutex::Lock lm (lock); + Glib::Threads::Mutex::Lock lm (lock); LocationList::iterator tmp; for (LocationList::iterator i = locations.begin(); i != locations.end(); ) { @@ -651,7 +714,7 @@ void Locations::clear_ranges () { { - Glib::Mutex::Lock lm (lock); + Glib::Threads::Mutex::Lock lm (lock); LocationList::iterator tmp; for (LocationList::iterator i = locations.begin(); i != locations.end(); ) { @@ -678,9 +741,9 @@ void Locations::add (Location *loc, bool make_current) { assert (loc); - + { - Glib::Mutex::Lock lm (lock); + Glib::Threads::Mutex::Lock lm (lock); locations.push_back (loc); if (make_current) { @@ -712,7 +775,7 @@ Locations::remove (Location *loc) } { - Glib::Mutex::Lock lm (lock); + Glib::Threads::Mutex::Lock lm (lock); for (i = locations.begin(); i != locations.end(); ++i) { if ((*i) == loc) { @@ -750,7 +813,7 @@ Locations::get_state () { XMLNode *node = new XMLNode ("Locations"); LocationList::iterator iter; - Glib::Mutex::Lock lm (lock); + Glib::Threads::Mutex::Lock lm (lock); for (iter = locations.begin(); iter != locations.end(); ++iter) { node->add_child_nocopy ((*iter)->get_state ()); @@ -769,24 +832,42 @@ 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); } { - Glib::Mutex::Lock lm (lock); + Glib::Threads::Mutex::Lock lm (lock); XMLNodeConstIterator niter; for (niter = nlist.begin(); niter != nlist.end(); ++niter) { 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 +899,7 @@ Locations::set_state (const XMLNode& node, int version) } if (add) { - locations.push_back (loc); + new_locations.push_back (loc); } } @@ -827,6 +908,8 @@ Locations::set_state (const XMLNode& node, int version) } } + locations = new_locations; + if (locations.size()) { current_location = locations.front(); } else { @@ -839,72 +922,87 @@ Locations::set_state (const XMLNode& node, int version) return 0; } + +typedef std::pair LocationPair; + struct LocationStartEarlierComparison { - bool operator() (Location *a, Location *b) { - return a->start() < b->start(); + bool operator() (LocationPair a, LocationPair b) { + return a.first < b.first; } }; struct LocationStartLaterComparison { - bool operator() (Location *a, Location *b) { - return a->start() > b->start(); + bool operator() (LocationPair a, LocationPair b) { + return a.first > b.first; } }; -Location * -Locations::first_location_before (framepos_t frame, bool include_special_ranges) +framepos_t +Locations::first_mark_before (framepos_t frame, bool include_special_ranges) { - LocationList locs; - - { - Glib::Mutex::Lock lm (lock); - locs = locations; + Glib::Threads::Mutex::Lock lm (lock); + vector locs; + + for (LocationList::iterator i = locations.begin(); i != locations.end(); ++i) { + locs.push_back (make_pair ((*i)->start(), (*i))); + if (!(*i)->is_mark()) { + locs.push_back (make_pair ((*i)->end(), (*i))); + } } LocationStartLaterComparison cmp; - locs.sort (cmp); + sort (locs.begin(), locs.end(), cmp); - /* locs is now sorted latest..earliest */ + /* locs is sorted in ascending order */ - for (LocationList::iterator i = locs.begin(); i != locs.end(); ++i) { - if (!include_special_ranges && ((*i)->is_auto_loop() || (*i)->is_auto_punch())) { + for (vector::iterator i = locs.begin(); i != locs.end(); ++i) { + if ((*i).second->is_hidden()) { continue; } - if (!(*i)->is_hidden() && (*i)->start() < frame) { - return (*i); + if (!include_special_ranges && ((*i).second->is_auto_loop() || (*i).second->is_auto_punch())) { + continue; + } + if ((*i).first < frame) { + return (*i).first; } } - return 0; + return -1; } -Location * -Locations::first_location_after (framepos_t frame, bool include_special_ranges) +framepos_t +Locations::first_mark_after (framepos_t frame, bool include_special_ranges) { - LocationList locs; + Glib::Threads::Mutex::Lock lm (lock); + vector locs; - { - Glib::Mutex::Lock lm (lock); - locs = locations; + for (LocationList::iterator i = locations.begin(); i != locations.end(); ++i) { + locs.push_back (make_pair ((*i)->start(), (*i))); + if (!(*i)->is_mark()) { + locs.push_back (make_pair ((*i)->end(), (*i))); + } } LocationStartEarlierComparison cmp; - locs.sort (cmp); - - /* locs is now sorted earliest..latest */ + sort (locs.begin(), locs.end(), cmp); + + /* locs is sorted in reverse order */ - for (LocationList::iterator i = locs.begin(); i != locs.end(); ++i) { - if (!include_special_ranges && ((*i)->is_auto_loop() || (*i)->is_auto_punch())) { + for (vector::iterator i = locs.begin(); i != locs.end(); ++i) { + if ((*i).second->is_hidden()) { continue; } - if (!(*i)->is_hidden() && (*i)->start() > frame) { - return (*i); + if (!include_special_ranges && ((*i).second->is_auto_loop() || (*i).second->is_auto_punch())) { + continue; + } + if ((*i).first > frame) { + return (*i).first; } } - return 0; + return -1; } /** Look for the `marks' (either locations which are marks, or start/end points of range markers) either @@ -918,16 +1016,16 @@ void Locations::marks_either_side (framepos_t const frame, framepos_t& before, framepos_t& after) const { before = after = max_framepos; - + LocationList locs; { - Glib::Mutex::Lock lm (lock); + Glib::Threads::Mutex::Lock lm (lock); locs = locations; } /* Get a list of positions; don't store any that are exactly on our requested position */ - + std::list positions; for (LocationList::const_iterator i = locs.begin(); i != locs.end(); ++i) { @@ -974,7 +1072,7 @@ Locations::marks_either_side (framepos_t const frame, framepos_t& before, framep /* none before */ return; } - + --i; before = *i; } @@ -1016,7 +1114,7 @@ uint32_t Locations::num_range_markers () const { uint32_t cnt = 0; - Glib::Mutex::Lock lm (lock); + Glib::Threads::Mutex::Lock lm (lock); for (LocationList::const_iterator i = locations.begin(); i != locations.end(); ++i) { if ((*i)->is_range_marker()) { ++cnt; @@ -1039,7 +1137,7 @@ Locations::get_location_by_id(PBD::ID id) void Locations::find_all_between (framepos_t start, framepos_t end, LocationList& ll, Location::Flags flags) { - Glib::Mutex::Lock lm (lock); + Glib::Threads::Mutex::Lock lm (lock); for (LocationList::const_iterator i = locations.begin(); i != locations.end(); ++i) { if ((flags == 0 || (*i)->matches (flags)) &&