X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Flocation.cc;h=5828c57f65149fc96418831147fdf0d4007a2c80;hb=5b520324ceab2559723b4ef5127301fa61ff4846;hp=f4eea2cfc5555c2b8af0c91fce4f3f45ea6d23e7;hpb=ddfc8d2185ec9cef7afe74091ea544ec286f13a8;p=ardour.git diff --git a/libs/ardour/location.cc b/libs/ardour/location.cc index f4eea2cfc5..5828c57f65 100644 --- a/libs/ardour/location.cc +++ b/libs/ardour/location.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2000 Paul Davis + Copyright (C) 2000 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,7 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ #include @@ -24,25 +23,70 @@ #include #include #include -#include +#include -#include -#include +#include "pbd/stl_delete.h" +#include "pbd/xml++.h" +#include "pbd/enumwriter.h" -#include +#include "ardour/location.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 sigc; +using namespace PBD; + +Location::Location (Session& s) + : SessionHandleRef (s) + , _start (0) + , _end (0) + , _flags (Flags (0)) + , _locked (false) + , _position_lock_style (AudioTime) +{ + +} + +Location::Location (Session& s, nframes64_t sample_start, nframes64_t sample_end, const std::string &name, Flags bits) + : SessionHandleRef (s) + , _name (name) + , _start (sample_start) + , _end (sample_end) + , _flags (bits) + , _locked (false) + , _position_lock_style (AudioTime) +{ + recompute_bbt_from_frames (); +} Location::Location (const Location& other) - : _name (other._name), - _start (other._start), - _end (other._end), - _flags (other._flags) + : SessionHandleRef (other._session) + , StatefulDestructible() + , _name (other._name) + , _start (other._start) + , _bbt_start (other._bbt_start) + , _end (other._end) + , _bbt_end (other._bbt_end) + , _flags (other._flags) + , _position_lock_style (other._position_lock_style) +{ + /* copy is not locked even if original was */ + + _locked = false; +} + +Location::Location (Session& s, const XMLNode& node) + : SessionHandleRef (s) { + if (set_state (node, Stateful::loading_state_version)) { + throw failed_constructor (); + } } Location* @@ -54,79 +98,143 @@ Location::operator= (const Location& other) _name = other._name; _start = other._start; + _bbt_start = other._bbt_start; _end = other._end; + _bbt_end = other._bbt_end; _flags = other._flags; + _position_lock_style = other._position_lock_style; + + /* copy is not locked even if original was */ + + _locked = false; /* "changed" not emitted on purpose */ - + return this; } +/** Set start position. + * @param s New start. + * @param force true to force setting, even if the given new start is after the current end. + * @param allow_bbt_recompute True to recompute BBT start time from the new given start time. + */ int -Location::set_start (jack_nframes_t s) +Location::set_start (nframes64_t s, bool force, bool allow_bbt_recompute) { + if (_locked) { + return -1; + } + + if (!force) { + if (((is_auto_punch() || is_auto_loop()) && s >= _end) || (!is_mark() && s > _end)) { + return -1; + } + } + if (is_mark()) { if (_start != s) { _start = s; _end = s; - start_changed(this); /* EMIT SIGNAL */ + if (allow_bbt_recompute) { + recompute_bbt_from_frames (); + } + start_changed (this); /* EMIT SIGNAL */ + end_changed (this); /* EMIT SIGNAL */ } return 0; } - - if (((is_auto_punch() || is_auto_loop()) && s >= _end) || s > _end) { - return -1; - } - + if (s != _start) { - _start = s; - start_changed(this); /* EMIT SIGNAL */ + _start = s; + if (allow_bbt_recompute) { + recompute_bbt_from_frames (); + } + start_changed (this); /* EMIT SIGNAL */ + if (is_session_range ()) { + Session::StartTimeChanged (); /* EMIT SIGNAL */ + AudioFileSource::set_header_position_offset (s); + } } 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 allow_bbt_recompute True to recompute BBT end time from the new given end time. + */ int -Location::set_end (jack_nframes_t e) +Location::set_end (nframes64_t e, bool force, bool allow_bbt_recompute) { + if (_locked) { + return -1; + } + + if (!force) { + if (((is_auto_punch() || is_auto_loop()) && e <= _start) || e < _start) { + return -1; + } + } + if (is_mark()) { if (_start != e) { _start = e; _end = e; - end_changed(this); /* EMIT SIGNAL */ + if (allow_bbt_recompute) { + recompute_bbt_from_frames (); + } + start_changed (this); /* EMIT SIGNAL */ + end_changed (this); /* EMIT SIGNAL */ } return 0; } - if (((is_auto_punch() || is_auto_loop()) && e <= _start) || e < _start) { - return -1; - } - if (e != _end) { - _end = e; - end_changed(this); /* EMIT SIGNAL */ + _end = e; + if (allow_bbt_recompute) { + recompute_bbt_from_frames (); + } + end_changed(this); /* EMIT SIGNAL */ + + if (is_session_range()) { + Session::EndTimeChanged (); /* EMIT SIGNAL */ + } } + return 0; } int -Location::set (jack_nframes_t start, jack_nframes_t end) +Location::set (nframes64_t start, nframes64_t end, bool allow_bbt_recompute) { - if (is_mark() && start != end) { - return -1; - } else if (((is_auto_punch() || is_auto_loop()) && start >= end) || (start > end)) { + /* check validity */ + if (((is_auto_punch() || is_auto_loop()) && start >= end) || (!is_mark() && start > end)) { return -1; } - - if (_start != start) { - _start = start; - start_changed(this); /* EMIT SIGNAL */ + + /* 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); + + return (s == 0 && e == 0) ? 0 : -1; +} + +int +Location::move_to (nframes64_t pos) +{ + if (_locked) { + return -1; } - if (_end != end) { - _end = end; - end_changed(this); /* EMIT SIGNAL */ + if (_start != pos) { + _start = pos; + _end = _start + length(); + recompute_bbt_from_frames (); + + changed (this); /* EMIT SIGNAL */ } + return 0; } @@ -141,29 +249,29 @@ Location::set_hidden (bool yn, void *src) void Location::set_cd (bool yn, void *src) { - if (set_flag_internal (yn, IsCDMarker)) { - FlagsChanged (this, src); /* EMIT SIGNAL */ + // XXX this really needs to be session start + // but its not available here - leave to GUI + + if (_start == 0) { + error << _("You cannot put a CD marker at this position") << endmsg; + return; } -} -void -Location::set_is_end (bool yn, void *src) -{ - if (set_flag_internal (yn, IsEnd)) { + if (set_flag_internal (yn, IsCDMarker)) { FlagsChanged (this, src); /* EMIT SIGNAL */ } } void -Location::set_is_start (bool yn, void *src) +Location::set_is_range_marker (bool yn, void *src) { - if (set_flag_internal (yn, IsStart)) { - FlagsChanged (this, src); /* EMIT SIGNAL */ - } + if (set_flag_internal (yn, IsRangeMarker)) { + FlagsChanged (this, src); /* EMIT SIGNAL */ + } } void -Location::set_auto_punch (bool yn, void *src) +Location::set_auto_punch (bool yn, void *src) { if (is_mark() || _start == _end) { return; @@ -175,7 +283,7 @@ Location::set_auto_punch (bool yn, void *src) } void -Location::set_auto_loop (bool yn, void *src) +Location::set_auto_loop (bool yn, void *src) { if (is_mark() || _start == _end) { return; @@ -191,12 +299,12 @@ Location::set_flag_internal (bool yn, Flags flag) { if (yn) { if (!(_flags & flag)) { - _flags |= flag; + _flags = Flags (_flags | flag); return true; } } else { if (_flags & flag) { - _flags &= ~flag; + _flags = Flags (_flags & ~flag); return true; } } @@ -211,7 +319,7 @@ Location::set_mark (bool yn) if (_start != _end) { return; } - + set_flag_internal (yn, IsMark); } @@ -223,155 +331,188 @@ Location::cd_info_node(const string & name, const string & value) root->add_property("name", name); root->add_property("value", value); - + return *root; } - + XMLNode& -Location::get_state (void) +Location::get_state () { XMLNode *node = new XMLNode ("Location"); - char buf[32]; + char buf[64]; typedef map::const_iterator CI; + for(CI m = cd_info.begin(); m != cd_info.end(); ++m){ node->add_child_nocopy(cd_info_node(m->first, m->second)); } + id().print (buf, sizeof (buf)); + node->add_property("id", buf); node->add_property ("name", name()); - snprintf (buf, sizeof (buf), "%u", start()); + snprintf (buf, sizeof (buf), "%" PRId64, start()); node->add_property ("start", buf); - snprintf (buf, sizeof (buf), "%u", end()); + snprintf (buf, sizeof (buf), "%" PRId64, end()); node->add_property ("end", buf); - snprintf (buf, sizeof (buf), "%" PRIu32, (uint32_t) _flags); - node->add_property ("flags", buf); + node->add_property ("flags", enum_2_string (_flags)); + node->add_property ("locked", (_locked ? "yes" : "no")); return *node; } int -Location::set_state (const XMLNode& node) +Location::set_state (const XMLNode& node, int /*version*/) { - XMLPropertyList plist; const XMLProperty *prop; XMLNodeList cd_list = node.children(); XMLNodeConstIterator cd_iter; XMLNode *cd_node; - + string cd_name; string cd_value; - if (node.name() != "Location") { error << _("incorrect XML node passed to Location::set_state") << endmsg; return -1; } - plist = node.properties(); - + if ((prop = node.property ("id")) == 0) { + warning << _("XML node for Location has no ID information") << endmsg; + } else { + _id = prop->value (); + } + if ((prop = node.property ("name")) == 0) { error << _("XML node for Location has no name information") << endmsg; return -1; } - + set_name (prop->value()); - + if ((prop = node.property ("start")) == 0) { - error << _("XML node for Location has no start information") << endmsg; + error << _("XML node for Location has no start information") << endmsg; return -1; } - + /* can't use set_start() here, because _end may make the value of _start illegal. */ - - _start = atoi (prop->value().c_str()); - + + sscanf (prop->value().c_str(), "%" PRId64, &_start); + if ((prop = node.property ("end")) == 0) { - error << _("XML node for Location has no end information") << endmsg; + error << _("XML node for Location has no end information") << endmsg; return -1; } - - _end = atoi (prop->value().c_str()); - - _flags = 0; - + + sscanf (prop->value().c_str(), "%" PRId64, &_end); + if ((prop = node.property ("flags")) == 0) { - error << _("XML node for Location has no flags information") << endmsg; + error << _("XML node for Location has no flags information") << endmsg; return -1; } - - _flags = Flags (atoi (prop->value().c_str())); + + _flags = Flags (string_2_enum (prop->value(), _flags)); + + if ((prop = node.property ("locked")) != 0) { + _locked = string_is_affirmative (prop->value()); + } else { + _locked = false; + } for (cd_iter = cd_list.begin(); cd_iter != cd_list.end(); ++cd_iter) { - + cd_node = *cd_iter; - + 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 ("value")) != 0) { cd_value = prop->value(); } else { throw failed_constructor (); } - - + + cd_info[cd_name] = cd_value; - + } - changed(this); /* EMIT SIGNAL */ - + recompute_bbt_from_frames (); + + changed (this); /* EMIT SIGNAL */ + return 0; } -/*---------------------------------------------------------------------- */ +void +Location::set_position_lock_style (PositionLockStyle ps) +{ + if (_position_lock_style == ps) { + return; + } -Locations::Locations () + _position_lock_style = ps; -{ - current_location = 0; - save_state (_("initial")); + recompute_bbt_from_frames (); } -Locations::~Locations () +void +Location::recompute_bbt_from_frames () { - std::set all_locations; + if (_position_lock_style != MusicTime) { + return; + } - for (StateMap::iterator siter = states.begin(); siter != states.end(); ++siter) { + _session.tempo_map().bbt_time (_start, _bbt_start); + _session.tempo_map().bbt_time (_end, _bbt_end); +} - State* lstate = dynamic_cast (*siter); +void +Location::recompute_frames_from_bbt () +{ + if (_position_lock_style != MusicTime) { + return; + } - for (LocationList::iterator liter = lstate->locations.begin(); liter != lstate->locations.end(); ++liter) { - all_locations.insert (*liter); - } + TempoMap& map (_session.tempo_map()); + set (map.frame_time (_bbt_start), map.frame_time (_bbt_end), false); +} - for (LocationList::iterator siter = lstate->states.begin(); siter != lstate->states.end(); ++siter) { - all_locations.insert (*siter); - } - } +/*---------------------------------------------------------------------- */ - set_delete (&all_locations); +Locations::Locations (Session& s) + : SessionHandleRef (s) +{ + current_location = 0; +} + +Locations::~Locations () +{ + for (LocationList::iterator i = locations.begin(); i != locations.end(); ) { + LocationList::iterator tmp = i; + ++tmp; + delete *i; + i = tmp; + } } int Locations::set_current (Location *loc, bool want_lock) - { int ret; if (want_lock) { - LockMonitor lm (lock, __LINE__, __FILE__); + Glib::Mutex::Lock lm (lock); ret = set_current_unlocked (loc); } else { ret = set_current_unlocked (loc); @@ -383,6 +524,40 @@ Locations::set_current (Location *loc, bool want_lock) return ret; } +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]; + + 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; + } + } + for (int k=1; k<=SUFFIX_MAX; k++) { + if (available[k]) { + snprintf (buf, 31, "%d", k); + result += buf; + return 1; + } + } + return 0; +} + int Locations::set_current_unlocked (Location *loc) { @@ -390,7 +565,7 @@ Locations::set_current_unlocked (Location *loc) error << _("Locations: attempt to use unknown location as selected location") << endmsg; return -1; } - + current_location = loc; return 0; } @@ -399,39 +574,39 @@ void Locations::clear () { { - LockMonitor lm (lock, __LINE__, __FILE__); - LocationList::iterator tmp; + Glib::Mutex::Lock lm (lock); + for (LocationList::iterator i = locations.begin(); i != locations.end(); ) { - tmp = i; + + LocationList::iterator tmp = i; ++tmp; - if (!(*i)->is_end()) { + + if (!(*i)->is_session_range()) { locations.erase (i); } + i = tmp; } - locations.clear (); current_location = 0; } - save_state (_("clear")); - - changed (); /* EMIT SIGNAL */ + changed (OTHER); /* EMIT SIGNAL */ current_changed (0); /* EMIT SIGNAL */ -} +} void Locations::clear_markers () { { - LockMonitor lm (lock, __LINE__, __FILE__); + Glib::Mutex::Lock lm (lock); LocationList::iterator tmp; for (LocationList::iterator i = locations.begin(); i != locations.end(); ) { tmp = i; ++tmp; - if ((*i)->is_mark() && !(*i)->is_end()) { + if ((*i)->is_mark() && !(*i)->is_session_range()) { locations.erase (i); } @@ -439,18 +614,16 @@ Locations::clear_markers () } } - save_state (_("clear markers")); - - changed (); /* EMIT SIGNAL */ -} + changed (OTHER); /* EMIT SIGNAL */ +} void Locations::clear_ranges () { { - LockMonitor lm (lock, __LINE__, __FILE__); + Glib::Mutex::Lock lm (lock); LocationList::iterator tmp; - + for (LocationList::iterator i = locations.begin(); i != locations.end(); ) { tmp = i; @@ -467,47 +640,44 @@ Locations::clear_ranges () current_location = 0; } - save_state (_("clear ranges")); - - changed (); /* EMIT SIGNAL */ + changed (OTHER); /* EMIT SIGNAL */ current_changed (0); /* EMIT SIGNAL */ -} +} void Locations::add (Location *loc, bool make_current) { + assert (loc); + { - LockMonitor lm (lock, __LINE__, __FILE__); + Glib::Mutex::Lock lm (lock); locations.push_back (loc); if (make_current) { current_location = loc; } } - - save_state (_("add")); added (loc); /* EMIT SIGNAL */ if (make_current) { current_changed (current_location); /* EMIT SIGNAL */ - } + } } void Locations::remove (Location *loc) - { bool was_removed = false; bool was_current = false; LocationList::iterator i; - if (loc->is_end()) { + if (loc->is_session_range()) { return; } { - LockMonitor lm (lock, __LINE__, __FILE__); + Glib::Mutex::Lock lm (lock); for (i = locations.begin(); i != locations.end(); ++i) { if ((*i) == loc) { @@ -521,25 +691,23 @@ Locations::remove (Location *loc) } } } - + if (was_removed) { - save_state (_("remove")); - removed (loc); /* EMIT SIGNAL */ + removed (loc); /* EMIT SIGNAL */ if (was_current) { current_changed (0); /* EMIT SIGNAL */ } - changed (); /* EMIT_SIGNAL */ + changed (REMOVAL); /* EMIT_SIGNAL */ } } void -Locations::location_changed (Location* loc) +Locations::location_changed (Location* /*loc*/) { - save_state (X_("location changed")); - changed (); /* EMIT SIGNAL */ + changed (OTHER); /* EMIT SIGNAL */ } XMLNode& @@ -547,41 +715,83 @@ Locations::get_state () { XMLNode *node = new XMLNode ("Locations"); LocationList::iterator iter; - LockMonitor lm (lock, __LINE__, __FILE__); - + Glib::Mutex::Lock lm (lock); + for (iter = locations.begin(); iter != locations.end(); ++iter) { node->add_child_nocopy ((*iter)->get_state ()); } return *node; -} +} int -Locations::set_state (const XMLNode& node) +Locations::set_state (const XMLNode& node, int version) { - XMLNodeList nlist; - XMLNodeConstIterator niter; - if (node.name() != "Locations") { error << _("incorrect XML mode passed to Locations::set_state") << endmsg; return -1; } - - nlist = node.children(); - + + XMLNodeList nlist = node.children(); + + locations.clear (); + 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); + } + { - LockMonitor lm (lock, __LINE__, __FILE__); + Glib::Mutex::Lock lm (lock); + XMLNodeConstIterator niter; for (niter = nlist.begin(); niter != nlist.end(); ++niter) { - Location *loc = new Location; - - if (loc->set_state (**niter)) { - delete loc; - } else { - locations.push_back (loc); + + try { + + Location *loc = new Location (_session, **niter); + + bool add = true; + + if (version < 3000) { + /* look for old-style IsStart / IsEnd properties in this location; + if they are present, update the session_range_location accordingly + */ + XMLProperty const * prop = (*niter)->property ("flags"); + if (prop) { + string v = prop->value (); + while (1) { + string::size_type const c = v.find_first_of (','); + string const s = v.substr (0, c); + if (s == X_("IsStart")) { + session_range_location->set_start (loc->start()); + add = false; + } else if (s == X_("IsEnd")) { + session_range_location->set_end (loc->start()); + add = false; + } + + if (c == string::npos) { + break; + } + + v = v.substr (c + 1); + } + } + } + + if (add) { + locations.push_back (loc); + } + } + + catch (failed_constructor& err) { + error << _("could not load location from session file - ignored") << endmsg; } } - + if (locations.size()) { current_location = locations.front(); } else { @@ -589,19 +799,19 @@ Locations::set_state (const XMLNode& node) } } - changed (); /* EMIT SIGNAL */ - + changed (OTHER); /* EMIT SIGNAL */ + return 0; -} +} -struct LocationStartEarlierComparison +struct LocationStartEarlierComparison { bool operator() (Location *a, Location *b) { return a->start() < b->start(); } }; -struct LocationStartLaterComparison +struct LocationStartLaterComparison { bool operator() (Location *a, Location *b) { return a->start() > b->start(); @@ -609,12 +819,12 @@ struct LocationStartLaterComparison }; Location * -Locations::first_location_before (jack_nframes_t frame) +Locations::first_location_before (nframes64_t frame, bool include_special_ranges) { LocationList locs; { - LockMonitor lm (lock, __LINE__, __FILE__); + Glib::Mutex::Lock lm (lock); locs = locations; } @@ -622,8 +832,11 @@ Locations::first_location_before (jack_nframes_t frame) locs.sort (cmp); /* locs is now sorted latest..earliest */ - + for (LocationList::iterator i = locs.begin(); i != locs.end(); ++i) { + if (!include_special_ranges && ((*i)->is_auto_loop() || (*i)->is_auto_punch())) { + continue; + } if (!(*i)->is_hidden() && (*i)->start() < frame) { return (*i); } @@ -633,12 +846,12 @@ Locations::first_location_before (jack_nframes_t frame) } Location * -Locations::first_location_after (jack_nframes_t frame) +Locations::first_location_after (nframes64_t frame, bool include_special_ranges) { LocationList locs; { - LockMonitor lm (lock, __LINE__, __FILE__); + Glib::Mutex::Lock lm (lock); locs = locations; } @@ -646,8 +859,11 @@ Locations::first_location_after (jack_nframes_t frame) locs.sort (cmp); /* locs is now sorted earliest..latest */ - + for (LocationList::iterator i = locs.begin(); i != locs.end(); ++i) { + if (!include_special_ranges && ((*i)->is_auto_loop() || (*i)->is_auto_punch())) { + continue; + } if (!(*i)->is_hidden() && (*i)->start() > frame) { return (*i); } @@ -656,27 +872,88 @@ Locations::first_location_after (jack_nframes_t frame) return 0; } -Location* -Locations::end_location () const +/** Look for the `marks' (either locations which are marks, or start/end points of range markers) either + * side of a frame. Note that if frame is exactly on a `mark', that mark will not be considered for returning + * as before/after. + * @param frame Frame to look for. + * @param before Filled in with the position of the last `mark' before `frame' (or max_frames if none exists) + * @param after Filled in with the position of the next `mark' after `frame' (or max_frames if none exists) + */ +void +Locations::marks_either_side (nframes64_t const frame, nframes64_t& before, nframes64_t& after) const { - for (LocationList::const_iterator i = locations.begin(); i != locations.end(); ++i) { - if ((*i)->is_end()) { - return const_cast (*i); + before = after = max_frames; + + LocationList locs; + + { + Glib::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) { + if (((*i)->is_auto_loop() || (*i)->is_auto_punch())) { + continue; + } + + if (!(*i)->is_hidden()) { + if ((*i)->is_mark ()) { + if ((*i)->start() != frame) { + positions.push_back ((*i)->start ()); + } + } else { + if ((*i)->start() != frame) { + positions.push_back ((*i)->start ()); + } + if ((*i)->end() != frame) { + positions.push_back ((*i)->end ()); + } + } } } - return 0; -} + + if (positions.empty ()) { + return; + } + + positions.sort (); + + std::list::iterator i = positions.begin (); + while (i != positions.end () && *i < frame) { + ++i; + } + + if (i == positions.end ()) { + /* run out of marks */ + before = positions.back (); + return; + } + + after = *i; + + if (i == positions.begin ()) { + /* none before */ + return; + } + + --i; + before = *i; +} Location* -Locations::start_location () const +Locations::session_range_location () const { for (LocationList::const_iterator i = locations.begin(); i != locations.end(); ++i) { - if ((*i)->is_start()) { + if ((*i)->is_session_range()) { return const_cast (*i); } } return 0; -} +} Location* Locations::auto_loop_location () const @@ -687,7 +964,7 @@ Locations::auto_loop_location () const } } return 0; -} +} Location* Locations::auto_punch_location () const @@ -698,56 +975,41 @@ Locations::auto_punch_location () const } } return 0; -} +} -StateManager::State* -Locations::state_factory (std::string why) const +uint32_t +Locations::num_range_markers () const { - State* state = new State (why); - - state->locations = locations; - + uint32_t cnt = 0; + Glib::Mutex::Lock lm (lock); for (LocationList::const_iterator i = locations.begin(); i != locations.end(); ++i) { - state->states.push_back (new Location (**i)); + if ((*i)->is_range_marker()) { + ++cnt; + } } - - return state; + return cnt; } -Change -Locations::restore_state (StateManager::State& state) +Location * +Locations::get_location_by_id(PBD::ID id) { - { - LockMonitor lm (lock, __LINE__, __FILE__); - State* lstate = dynamic_cast (&state); - - locations = lstate->locations; - LocationList& states = lstate->states; - LocationList::iterator l, s; - - for (l = locations.begin(), s = states.begin(); s != states.end(); ++s, ++l) { - (*l) = (*s); - } - } + LocationList::iterator it; + for (it = locations.begin(); it != locations.end(); ++it) + if (id == (*it)->id()) + return *it; - return Change (0); + return 0; } -UndoAction -Locations::get_memento () const +void +Locations::find_all_between (nframes64_t start, nframes64_t end, LocationList& ll, Location::Flags flags) { - return sigc::bind (mem_fun (*(const_cast (this)), &StateManager::use_state), _current_state_id); -} + Glib::Mutex::Lock lm (lock); -uint32_t -Locations::num_range_markers () const -{ - uint32_t cnt = 0; - LockMonitor lm (lock, __LINE__, __FILE__); for (LocationList::const_iterator i = locations.begin(); i != locations.end(); ++i) { - if ((*i)->is_range_marker()) { - ++cnt; + if ((flags == 0 || (*i)->matches (flags)) && + ((*i)->start() >= start && (*i)->end() < end)) { + ll.push_back (*i); } } - return cnt; }