X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Flocation.cc;h=d827d0f2b606dfccd064c90c8771861795c84fb6;hb=4bdbe77414b956e27f2c1631e67189c70409a3d1;hp=4f90b322826974b67307a18678d643042090a490;hpb=1f8d176c1380951246e83d14d408c7515ca8b7ca;p=ardour.git diff --git a/libs/ardour/location.cc b/libs/ardour/location.cc index 4f90b32282..d827d0f2b6 100644 --- a/libs/ardour/location.cc +++ b/libs/ardour/location.cc @@ -25,23 +25,32 @@ #include #include +#include "pbd/convert.h" #include "pbd/stl_delete.h" #include "pbd/xml++.h" #include "pbd/enumwriter.h" #include "ardour/location.h" +#include "ardour/midi_scene_change.h" #include "ardour/session.h" #include "ardour/audiofilesource.h" #include "ardour/tempo.h" #include "i18n.h" -#define SUFFIX_MAX 32 - using namespace std; using namespace ARDOUR; using namespace PBD; +PBD::Signal0 Location::scene_changed; +PBD::Signal1 Location::name_changed; +PBD::Signal1 Location::end_changed; +PBD::Signal1 Location::start_changed; +PBD::Signal1 Location::flags_changed; +PBD::Signal1 Location::lock_changed; +PBD::Signal1 Location::position_lock_style_changed; +PBD::Signal1 Location::changed; + Location::Location (Session& s) : SessionHandleRef (s) , _start (0) @@ -54,6 +63,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 +71,8 @@ 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 (); @@ -79,6 +90,7 @@ Location::Location (const Location& other) , _bbt_end (other._bbt_end) , _flags (other._flags) , _position_lock_style (other._position_lock_style) + { /* copy is not locked even if original was */ @@ -86,16 +98,19 @@ Location::Location (const Location& other) assert (_start >= 0); assert (_end >= 0); + + /* scene change is NOT COPIED */ } Location::Location (Session& s, const XMLNode& node) : SessionHandleRef (s) + , _flags (Flags (0)) , _position_lock_style (AudioTime) { /* 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 (); } @@ -104,6 +119,21 @@ Location::Location (Session& s, const XMLNode& node) 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* Location::operator= (const Location& other) { @@ -119,6 +149,8 @@ Location::operator= (const Location& other) _flags = other._flags; _position_lock_style = other._position_lock_style; + /* XXX need to copy scene change */ + /* copy is not locked even if original was */ _locked = false; @@ -131,6 +163,18 @@ Location::operator= (const Location& other) return this; } +/** Set location name + */ + +void +Location::set_name (const std::string& str) +{ + _name = str; + + name_changed (this); /* EMIT SIGNAL */ + NameChanged (); /* EMIT SIGNAL */ +} + /** Set start position. * @param s New start. * @param force true to force setting, even if the given new start is after the current end. @@ -139,6 +183,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; } @@ -158,24 +206,41 @@ Location::set_start (framepos_t s, bool force, bool allow_bbt_recompute) } start_changed (this); /* EMIT SIGNAL */ - end_changed (this); /* EMIT SIGNAL */ + StartChanged (); /* EMIT SIGNAL */ + //end_changed (this); /* EMIT SIGNAL */ + //EndChanged (); /* EMIT SIGNAL */ + } + + /* moving the start (position) of a marker with a scene change + requires an update in the Scene Changer. + */ + + if (_scene_change) { + scene_changed (); /* EMIT SIGNAL */ } assert (_start >= 0); assert (_end >= 0); - + return 0; + } else if (!force) { + /* range locations must exceed a minimum duration */ + if (_end - s < Config->get_range_location_minimum()) { + return -1; + } } - + if (s != _start) { framepos_t const old = _start; - + _start = s; if (allow_bbt_recompute) { recompute_bbt_from_frames (); } start_changed (this); /* EMIT SIGNAL */ + StartChanged (); /* EMIT SIGNAL */ + if (is_session_range ()) { Session::StartTimeChanged (old); /* EMIT SIGNAL */ AudioFileSource::set_header_position_offset (s); @@ -183,18 +248,22 @@ Location::set_start (framepos_t s, bool force, bool allow_bbt_recompute) } assert (_start >= 0); - + return 0; } /** Set end position. * @param s New end. - * @param force true to force setting, even if the given new start is after the current end. + * @param force true to force setting, even if the given new end is before the current start. * @param allow_bbt_recompute True to recompute BBT end time from the new given end time. */ int Location::set_end (framepos_t e, bool force, bool allow_bbt_recompute) { + if (e < 0) { + return -1; + } + if (_locked) { return -1; } @@ -204,7 +273,7 @@ Location::set_end (framepos_t e, bool force, bool allow_bbt_recompute) return -1; } } - + if (is_mark()) { if (_start != e) { _start = e; @@ -212,24 +281,34 @@ Location::set_end (framepos_t e, bool force, bool allow_bbt_recompute) if (allow_bbt_recompute) { recompute_bbt_from_frames (); } - start_changed (this); /* EMIT SIGNAL */ + //start_changed (this); /* EMIT SIGNAL */ + //StartChanged (); /* EMIT SIGNAL */ end_changed (this); /* EMIT SIGNAL */ + EndChanged (); /* EMIT SIGNAL */ } assert (_start >= 0); assert (_end >= 0); - + return 0; + } else if (!force) { + /* range locations must exceed a minimum duration */ + if (e - _start < Config->get_range_location_minimum()) { + return -1; + } } if (e != _end) { + framepos_t const old = _end; - + _end = e; if (allow_bbt_recompute) { recompute_bbt_from_frames (); } + end_changed(this); /* EMIT SIGNAL */ + EndChanged(); /* EMIT SIGNAL */ if (is_session_range()) { Session::EndTimeChanged (old); /* EMIT SIGNAL */ @@ -242,23 +321,102 @@ Location::set_end (framepos_t e, bool force, bool allow_bbt_recompute) } int -Location::set (framepos_t start, framepos_t end, bool allow_bbt_recompute) +Location::set (framepos_t s, framepos_t e, bool allow_bbt_recompute) { + if (s < 0 || e < 0) { + return -1; + } + /* check validity */ - if (((is_auto_punch() || is_auto_loop()) && start >= end) || (!is_mark() && start > end)) { + if (((is_auto_punch() || is_auto_loop()) && s >= e) || (!is_mark() && s > e)) { return -1; } - /* now we know these values are ok, so force-set them */ - int const s = set_start (start, true, allow_bbt_recompute); - int const e = set_end (end, true, allow_bbt_recompute); + bool start_change = false; + bool end_change = false; + + if (is_mark()) { - return (s == 0 && e == 0) ? 0 : -1; + if (_start != s) { + _start = s; + _end = s; + + if (allow_bbt_recompute) { + recompute_bbt_from_frames (); + } + + start_change = true; + end_change = true; + } + + assert (_start >= 0); + assert (_end >= 0); + + } else { + + /* range locations must exceed a minimum duration */ + if (e - s < Config->get_range_location_minimum()) { + return -1; + } + + if (s != _start) { + + framepos_t const old = _start; + _start = s; + + if (allow_bbt_recompute) { + recompute_bbt_from_frames (); + } + + start_change = true; + + if (is_session_range ()) { + Session::StartTimeChanged (old); /* EMIT SIGNAL */ + AudioFileSource::set_header_position_offset (s); + } + } + + + if (e != _end) { + + framepos_t const old = _end; + _end = e; + + if (allow_bbt_recompute) { + recompute_bbt_from_frames (); + } + + end_change = true; + + if (is_session_range()) { + Session::EndTimeChanged (old); /* EMIT SIGNAL */ + } + } + + assert (_end >= 0); + } + + if (start_change && end_change) { + changed (this); + Changed (); + } else if (start_change) { + start_changed(this); /* EMIT SIGNAL */ + StartChanged(); /* EMIT SIGNAL */ + } else if (end_change) { + end_changed(this); /* EMIT SIGNAL */ + EndChanged(); /* EMIT SIGNAL */ + } + + return 0; } int Location::move_to (framepos_t pos) { + if (pos < 0) { + return -1; + } + if (_locked) { return -1; } @@ -269,6 +427,7 @@ Location::move_to (framepos_t pos) recompute_bbt_from_frames (); changed (this); /* EMIT SIGNAL */ + Changed (); /* EMIT SIGNAL */ } assert (_start >= 0); @@ -278,58 +437,85 @@ Location::move_to (framepos_t pos) } void -Location::set_hidden (bool yn, void *src) +Location::set_hidden (bool yn, void*) { if (set_flag_internal (yn, IsHidden)) { - FlagsChanged (this, src); /* EMIT SIGNAL */ + flags_changed (this); /* EMIT SIGNAL */ + FlagsChanged (); } } void -Location::set_cd (bool yn, void *src) +Location::set_cd (bool yn, void*) { // XXX this really needs to be session start // but its not available here - leave to GUI - if (_start == 0) { + if (yn && _start == 0) { error << _("You cannot put a CD marker at this position") << endmsg; return; } if (set_flag_internal (yn, IsCDMarker)) { - FlagsChanged (this, src); /* EMIT SIGNAL */ + flags_changed (this); /* EMIT SIGNAL */ + FlagsChanged (); + } +} + +void +Location::set_is_range_marker (bool yn, void*) +{ + if (set_flag_internal (yn, IsRangeMarker)) { + flags_changed (this); + FlagsChanged (); /* EMIT SIGNAL */ } } void -Location::set_is_range_marker (bool yn, void *src) +Location::set_skip (bool yn) { - if (set_flag_internal (yn, IsRangeMarker)) { - FlagsChanged (this, src); /* EMIT SIGNAL */ - } + if (is_range_marker() && length() > 0) { + if (set_flag_internal (yn, IsSkip)) { + flags_changed (this); + FlagsChanged (); + } + } +} + +void +Location::set_skipping (bool yn) +{ + if (is_range_marker() && is_skip() && length() > 0) { + if (set_flag_internal (yn, IsSkipping)) { + flags_changed (this); + FlagsChanged (); + } + } } void -Location::set_auto_punch (bool yn, void *src) +Location::set_auto_punch (bool yn, void*) { if (is_mark() || _start == _end) { return; } if (set_flag_internal (yn, IsAutoPunch)) { - FlagsChanged (this, src); /* EMIT SIGNAL */ + flags_changed (this); /* EMIT SIGNAL */ + FlagsChanged (); /* EMIT SIGNAL */ } } void -Location::set_auto_loop (bool yn, void *src) +Location::set_auto_loop (bool yn, void*) { if (is_mark() || _start == _end) { return; } if (set_flag_internal (yn, IsAutoLoop)) { - FlagsChanged (this, src); /* EMIT SIGNAL */ + flags_changed (this); /* EMIT SIGNAL */ + FlagsChanged (); /* EMIT SIGNAL */ } } @@ -398,13 +584,17 @@ Location::get_state () node->add_property ("locked", (_locked ? "yes" : "no")); node->add_property ("position-lock-style", enum_2_string (_position_lock_style)); + if (_scene_change) { + node->add_child_nocopy (_scene_change->get_state()); + } + return *node; } int -Location::set_state (const XMLNode& node, int /*version*/) +Location::set_state (const XMLNode& node, int version) { - const XMLProperty *prop; + XMLProperty const * prop; XMLNodeList cd_list = node.children(); XMLNodeConstIterator cd_iter; @@ -418,10 +608,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) { @@ -436,26 +624,31 @@ Location::set_state (const XMLNode& node, int /*version*/) return -1; } - /* can't use set_start() here, because _end - may make the value of _start illegal. - */ + /* can't use set_start() here, because _end + may make the value of _start illegal. + */ sscanf (prop->value().c_str(), "%" PRId64, &_start); if ((prop = node.property ("end")) == 0) { - error << _("XML node for Location has no end information") << endmsg; - return -1; + error << _("XML node for Location has no end information") << endmsg; + return -1; } sscanf (prop->value().c_str(), "%" PRId64, &_end); if ((prop = node.property ("flags")) == 0) { - error << _("XML node for Location has no flags information") << endmsg; - return -1; + error << _("XML node for Location has no flags information") << endmsg; + return -1; } + Flags old_flags (_flags); _flags = Flags (string_2_enum (prop->value(), _flags)); + if (old_flags != _flags) { + FlagsChanged (); + } + if ((prop = node.property ("locked")) != 0) { _locked = string_is_affirmative (prop->value()); } else { @@ -464,35 +657,42 @@ Location::set_state (const XMLNode& node, int /*version*/) for (cd_iter = cd_list.begin(); cd_iter != cd_list.end(); ++cd_iter) { - cd_node = *cd_iter; + cd_node = *cd_iter; - if (cd_node->name() != "CD-Info") { - continue; - } + if (cd_node->name() != "CD-Info") { + continue; + } - if ((prop = cd_node->property ("name")) != 0) { - cd_name = prop->value(); - } else { - throw failed_constructor (); - } + if ((prop = cd_node->property ("name")) != 0) { + cd_name = prop->value(); + } else { + throw failed_constructor (); + } - if ((prop = cd_node->property ("value")) != 0) { - cd_value = prop->value(); - } else { - throw failed_constructor (); - } + if ((prop = cd_node->property ("value")) != 0) { + cd_value = prop->value(); + } else { + throw failed_constructor (); + } - cd_info[cd_name] = cd_value; + 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)); } + XMLNode* scene_child = find_named_node (node, SceneChange::xml_node_name); + + if (scene_child) { + _scene_change = SceneChange::factory (*scene_child, version); + } + recompute_bbt_from_frames (); changed (this); /* EMIT SIGNAL */ + Changed (); /* EMIT SIGNAL */ assert (_start >= 0); assert (_end >= 0); @@ -511,7 +711,8 @@ Location::set_position_lock_style (PositionLockStyle ps) recompute_bbt_from_frames (); - PositionLockStyleChanged (this); /* EMIT SIGNAL */ + position_lock_style_changed (this); /* EMIT SIGNAL */ + PositionLockStyleChanged (); /* EMIT SIGNAL */ } void @@ -520,9 +721,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); + + _bbt_start = _session.tempo_map().beat_at_frame (_start); + _bbt_end = _session.tempo_map().beat_at_frame (_end); } void @@ -533,21 +734,35 @@ Location::recompute_frames_from_bbt () } TempoMap& map (_session.tempo_map()); - set (map.frame_time (_bbt_start), map.frame_time (_bbt_end), false); + set (map.frame_at_beat (_bbt_start), map.frame_at_beat (_bbt_end), false); } void Location::lock () { _locked = true; - LockChanged (this); + lock_changed (this); + LockChanged (); } void Location::unlock () { _locked = false; - LockChanged (this); + lock_changed (this); + LockChanged (); +} + +void +Location::set_scene_change (boost::shared_ptr sc) +{ + if (_scene_change != sc) { + _scene_change = sc; + _session.set_dirty (); + + scene_changed (); /* EMIT SIGNAL */ + SceneChangeChanged (); /* EMIT SIGNAL */ + } } /*---------------------------------------------------------------------- */ @@ -574,14 +789,14 @@ 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); } if (ret == 0) { - current_changed (current_location); /* EMIT SIGNAL */ + current_changed (current_location); /* EMIT SIGNAL */ } return ret; } @@ -590,33 +805,59 @@ int Locations::next_available_name(string& result,string base) { LocationList::iterator i; - Location* location; - string temp; string::size_type l; int suffix; char buf[32]; - bool available[SUFFIX_MAX+1]; + std::map taken; + uint32_t n; result = base; - for (int k=1; kname(); - if (l && !temp.find(base,0)) { - suffix = atoi(temp.substr(l,3).c_str()); - if (suffix) available[suffix] = false; + + if (!base.empty()) { + + /* find all existing names that match "base", and store + the numeric part of them (if any) in the map "taken" + */ + + for (i = locations.begin(); i != locations.end(); ++i) { + + const string& temp ((*i)->name()); + + if (!temp.find (base,0)) { + /* grab what comes after the "base" as if it was + a number, and assuming that works OK, + store it in "taken" so that we know it + has been used. + */ + if ((suffix = atoi (temp.substr(l))) != 0) { + taken.insert (make_pair (suffix,true)); + } + } } } - for (int k=1; k<=SUFFIX_MAX; k++) { - if (available[k]) { - snprintf (buf, 31, "%d", k); + + /* Now search for an un-used suffix to add to "base". This + will find "holes" in the numbering sequence when a location + was deleted. + + This must start at 1, both for human-numbering reasons + and also because the call to atoi() above would return + zero if there is no recognizable numeric suffix, causing + "base 0" not to be inserted into the "taken" map. + */ + + n = 1; + + while (n < UINT32_MAX) { + if (taken.find (n) == taken.end()) { + snprintf (buf, sizeof(buf), "%d", n); result += buf; return 1; } + ++n; } + return 0; } @@ -636,7 +877,7 @@ void Locations::clear () { { - Glib::Mutex::Lock lm (lock); + Glib::Threads::Mutex::Lock lm (lock); for (LocationList::iterator i = locations.begin(); i != locations.end(); ) { @@ -644,6 +885,7 @@ Locations::clear () ++tmp; if (!(*i)->is_session_range()) { + delete *i; locations.erase (i); } @@ -653,7 +895,7 @@ Locations::clear () current_location = 0; } - changed (OTHER); /* EMIT SIGNAL */ + changed (); /* EMIT SIGNAL */ current_changed (0); /* EMIT SIGNAL */ } @@ -661,7 +903,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(); ) { @@ -669,6 +911,7 @@ Locations::clear_markers () ++tmp; if ((*i)->is_mark() && !(*i)->is_session_range()) { + delete *i; locations.erase (i); } @@ -676,14 +919,14 @@ Locations::clear_markers () } } - changed (OTHER); /* EMIT SIGNAL */ + changed (); /* EMIT SIGNAL */ } 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(); ) { @@ -691,7 +934,19 @@ Locations::clear_ranges () tmp = i; ++tmp; + /* We do not remove these ranges as part of this + * operation + */ + + if ((*i)->is_auto_punch() || + (*i)->is_auto_loop() || + (*i)->is_session_range()) { + i = tmp; + continue; + } + if (!(*i)->is_mark()) { + delete *i; locations.erase (i); } @@ -702,7 +957,7 @@ Locations::clear_ranges () current_location = 0; } - changed (OTHER); /* EMIT SIGNAL */ + changed (); current_changed (0); /* EMIT SIGNAL */ } @@ -710,9 +965,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) { @@ -723,7 +978,7 @@ Locations::add (Location *loc, bool make_current) added (loc); /* EMIT SIGNAL */ if (make_current) { - current_changed (current_location); /* EMIT SIGNAL */ + current_changed (current_location); /* EMIT SIGNAL */ } if (loc->is_session_range()) { @@ -744,10 +999,11 @@ 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) { + delete *i; locations.erase (i); was_removed = true; if (current_location == loc) { @@ -764,25 +1020,17 @@ Locations::remove (Location *loc) removed (loc); /* EMIT SIGNAL */ if (was_current) { - current_changed (0); /* EMIT SIGNAL */ + current_changed (0); /* EMIT SIGNAL */ } - - changed (REMOVAL); /* EMIT_SIGNAL */ } } -void -Locations::location_changed (Location* /*loc*/) -{ - changed (OTHER); /* EMIT SIGNAL */ -} - XMLNode& 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 ()); @@ -801,24 +1049,44 @@ 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; + + // changed locations will be updated by Locations::changed signal + loc->set_state (**niter, version); + } else { + loc = new Location (_session, **niter); + } bool add = true; @@ -850,7 +1118,7 @@ Locations::set_state (const XMLNode& node, int version) } if (add) { - locations.push_back (loc); + new_locations.push_back (loc); } } @@ -859,6 +1127,32 @@ Locations::set_state (const XMLNode& node, int version) } } + /* We may have some unused locations in the old list. */ + for (LocationList::iterator i = locations.begin(); i != locations.end(); ) { + LocationList::iterator tmp = i; + ++tmp; + + LocationList::iterator n = new_locations.begin(); + bool found = false; + + while (n != new_locations.end ()) { + if ((*i)->id() == (*n)->id()) { + found = true; + break; + } + ++n; + } + + if (!found) { + delete *i; + locations.erase (i); + } + + i = tmp; + } + + locations = new_locations; + if (locations.size()) { current_location = locations.front(); } else { @@ -866,77 +1160,130 @@ Locations::set_state (const XMLNode& node, int version) } } - changed (OTHER); /* EMIT SIGNAL */ + changed (); /* EMIT SIGNAL */ 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::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))); + } } 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) +Location* +Locations::mark_at (framepos_t pos, framecnt_t slop) const { - LocationList locs; + Glib::Threads::Mutex::Lock lm (lock); + Location* closest = 0; + frameoffset_t mindelta = max_framepos; + frameoffset_t delta; - { - Glib::Mutex::Lock lm (lock); - locs = locations; + /* locations are not necessarily stored in linear time order so we have + * to iterate across all of them to find the one closest to a give point. + */ + + for (LocationList::const_iterator i = locations.begin(); i != locations.end(); ++i) { + + if ((*i)->is_mark()) { + if (pos > (*i)->start()) { + delta = pos - (*i)->start(); + } else { + delta = (*i)->start() - pos; + } + + if (slop == 0 && delta == 0) { + /* special case: no slop, and direct hit for position */ + return *i; + } + + if (delta <= slop) { + if (delta < mindelta) { + closest = *i; + mindelta = delta; + } + } + } + } + + return closest; +} + +framepos_t +Locations::first_mark_after (framepos_t frame, bool include_special_ranges) +{ + 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))); + } } LocationStartEarlierComparison cmp; - locs.sort (cmp); + sort (locs.begin(), locs.end(), cmp); - /* locs is now sorted earliest..latest */ + /* 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 (!include_special_ranges && ((*i).second->is_auto_loop() || (*i).second->is_auto_punch())) { continue; } - if (!(*i)->is_hidden() && (*i)->start() > frame) { - return (*i); + 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 @@ -950,16 +1297,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) { @@ -1006,7 +1353,7 @@ Locations::marks_either_side (framepos_t const frame, framepos_t& before, framep /* none before */ return; } - + --i; before = *i; } @@ -1041,14 +1388,14 @@ Locations::auto_punch_location () const return const_cast (*i); } } - return 0; + return 0; } 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; @@ -1060,18 +1407,18 @@ Locations::num_range_markers () const Location * Locations::get_location_by_id(PBD::ID id) { - LocationList::iterator it; - for (it = locations.begin(); it != locations.end(); ++it) - if (id == (*it)->id()) - return *it; + LocationList::iterator it; + for (it = locations.begin(); it != locations.end(); ++it) + if (id == (*it)->id()) + return *it; - return 0; + return 0; } 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)) && @@ -1080,3 +1427,4 @@ Locations::find_all_between (framepos_t start, framepos_t end, LocationList& ll, } } } +