X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Flocation.cc;h=019e25dd965f04dff153e9e11ab22e434420c11c;hb=9254e80c396265f484adb3b7bf5f0b502d096107;hp=39331cfda644284474e453a165b6ac8cc049004a;hpb=ffdf5ada616d285fafb58f45c2e3d37b212a328a;p=ardour.git diff --git a/libs/ardour/location.cc b/libs/ardour/location.cc index 39331cfda6..019e25dd96 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,39 +23,112 @@ #include #include #include -#include +#include -#include -#include +#include "pbd/convert.h" +#include "pbd/stl_delete.h" +#include "pbd/xml++.h" +#include "pbd/enumwriter.h" -#include -#include -#include +#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" using namespace std; using namespace ARDOUR; -using namespace sigc; 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) + , _end (0) + , _flags (Flags (0)) + , _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) + , _start (sample_start) + , _end (sample_end) + , _flags (bits) + , _locked (false) + , _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) - : _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) { - /* start and end flags can never be copied, because there can only ever be one of each */ + /* copy is not locked even if original was */ + + _locked = false; + + assert (_start >= 0); + assert (_end >= 0); - _flags = Flags (_flags & ~IsStart); - _flags = Flags (_flags & ~IsEnd); + /* scene change is NOT COPIED */ } -Location::Location (const XMLNode& node) +Location::Location (Session& s, const XMLNode& node) + : SessionHandleRef (s) + , _position_lock_style (AudioTime) { - if (set_state (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* @@ -68,147 +140,368 @@ 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; + + /* XXX need to copy scene change */ + + /* copy is not locked even if original was */ + + _locked = false; /* "changed" not emitted on purpose */ - + + assert (_start >= 0); + assert (_end >= 0); + 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. + * @param allow_bbt_recompute True to recompute BBT start time from the new given start time. + */ int -Location::set_start (nframes_t s) +Location::set_start (framepos_t s, bool force, bool allow_bbt_recompute) { + if (s < 0) { + return -1; + } + + 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; + if (allow_bbt_recompute) { + recompute_bbt_from_frames (); + } - start_changed(this); /* EMIT SIGNAL */ - - if ( is_start() ) { + start_changed (this); /* EMIT SIGNAL */ + StartChanged (); /* EMIT SIGNAL */ + end_changed (this); /* EMIT SIGNAL */ + EndChanged (); /* EMIT SIGNAL */ + } - Session::StartTimeChanged (); /* EMIT SIGNAL */ - AudioFileSource::set_header_position_offset ( s ); - } + /* moving the start (position) of a marker with a scene change + requires an update in the Scene Changer. + */ - if ( is_end() ) { - Session::EndTimeChanged (); /* EMIT SIGNAL */ - } + if (_scene_change) { + scene_changed (); /* EMIT SIGNAL */ } - return 0; - } - if (((is_auto_punch() || is_auto_loop()) && s >= _end) || s > _end) { - return -1; + assert (_start >= 0); + assert (_end >= 0); + + return 0; } if (s != _start) { - _start = s; - start_changed(this); /* EMIT SIGNAL */ + + 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); + } } + 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 allow_bbt_recompute True to recompute BBT end time from the new given end time. + */ int -Location::set_end (nframes_t e) +Location::set_end (framepos_t e, bool force, bool allow_bbt_recompute) { + if (e < 0) { + return -1; + } + + 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 */ + StartChanged (); /* EMIT SIGNAL */ + end_changed (this); /* EMIT SIGNAL */ + EndChanged (); /* EMIT SIGNAL */ } - return 0; - } - if (((is_auto_punch() || is_auto_loop()) && e <= _start) || e < _start) { - return -1; + assert (_start >= 0); + assert (_end >= 0); + + return 0; } if (e != _end) { - _end = e; - end_changed(this); /* EMIT SIGNAL */ + + 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 */ + } } + + assert (_end >= 0); + return 0; } int -Location::set (nframes_t start, nframes_t end) +Location::set (framepos_t s, framepos_t e, bool allow_bbt_recompute) { - if (is_mark() && start != end) { + if (s < 0 || e < 0) { return -1; - } else if (((is_auto_punch() || is_auto_loop()) && start >= end) || (start > end)) { + } + + /* check validity */ + if (((is_auto_punch() || is_auto_loop()) && s >= e) || (!is_mark() && s > e)) { return -1; } - - if (_start != start) { - _start = start; - start_changed(this); /* EMIT SIGNAL */ + + bool start_change = false; + bool end_change = false; + + if (is_mark()) { + + 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 { + + 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) { + start_changed(this); /* EMIT SIGNAL */ + StartChanged(); /* EMIT SIGNAL */ + } + + if (end_change) { + end_changed(this); /* EMIT SIGNAL */ + EndChanged(); /* EMIT SIGNAL */ + } + + if (start_change && end_change) { + changed (this); + Changed (); + } + + return 0; +} + +int +Location::move_to (framepos_t pos) +{ + if (pos < 0) { + return -1; } - if (_end != end) { - _end = end; - end_changed(this); /* EMIT SIGNAL */ + if (_locked) { + return -1; } + + if (_start != pos) { + _start = pos; + _end = _start + length(); + recompute_bbt_from_frames (); + + changed (this); /* EMIT SIGNAL */ + Changed (); /* EMIT SIGNAL */ + } + + assert (_start >= 0); + assert (_end >= 0); + return 0; } 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 (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_end (bool yn, void *src) +Location::set_is_range_marker (bool yn, void*) { - if (set_flag_internal (yn, IsEnd)) { - FlagsChanged (this, src); /* EMIT SIGNAL */ - } + if (set_flag_internal (yn, IsRangeMarker)) { + flags_changed (this); + FlagsChanged (); /* EMIT SIGNAL */ + } } void -Location::set_is_start (bool yn, void *src) +Location::set_skip (bool yn) { - if (set_flag_internal (yn, IsStart)) { - 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 */ } } @@ -217,12 +510,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; } } @@ -237,7 +530,7 @@ Location::set_mark (bool yn) if (_start != _end) { return; } - + set_flag_internal (yn, IsMark); } @@ -249,13 +542,13 @@ 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[64]; @@ -269,25 +562,30 @@ Location::get_state (void) 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")); + 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) +Location::set_state (const XMLNode& node, int version) { const XMLProperty *prop; XMLNodeList cd_list = node.children(); XMLNodeConstIterator cd_iter; XMLNode *cd_node; - + string cd_name; string cd_value; @@ -296,113 +594,179 @@ Location::set_state (const XMLNode& node) 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) { 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; + continue; } - + if ((prop = cd_node->property ("name")) != 0) { - cd_name = prop->value(); + cd_name = prop->value(); } else { - throw failed_constructor (); + throw failed_constructor (); } - + if ((prop = cd_node->property ("value")) != 0) { - cd_value = prop->value(); + cd_value = prop->value(); } else { - throw failed_constructor (); + throw failed_constructor (); } - - + + cd_info[cd_name] = cd_value; - } - changed(this); /* EMIT SIGNAL */ - + 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); + return 0; } -/*---------------------------------------------------------------------- */ +void +Location::set_position_lock_style (PositionLockStyle ps) +{ + if (_position_lock_style == ps) { + return; + } + + _position_lock_style = ps; -Locations::Locations () + recompute_bbt_from_frames (); + position_lock_style_changed (this); /* EMIT SIGNAL */ + PositionLockStyleChanged (); /* EMIT SIGNAL */ +} + +void +Location::recompute_bbt_from_frames () { - current_location = 0; - save_state (_("initial")); + if (_position_lock_style != MusicTime) { + return; + } + + _session.bbt_time (_start, _bbt_start); + _session.bbt_time (_end, _bbt_end); } -Locations::~Locations () +void +Location::recompute_frames_from_bbt () { - std::set all_locations; - - for (StateMap::iterator siter = states.begin(); siter != states.end(); ++siter) { + if (_position_lock_style != MusicTime) { + return; + } - State* lstate = dynamic_cast (*siter); + TempoMap& map (_session.tempo_map()); + set (map.frame_time (_bbt_start), map.frame_time (_bbt_end), false); +} - for (LocationList::iterator liter = lstate->locations.begin(); liter != lstate->locations.end(); ++liter) { - all_locations.insert (*liter); - } +void +Location::lock () +{ + _locked = true; + lock_changed (this); + LockChanged (); +} - for (LocationList::iterator siter = lstate->states.begin(); siter != lstate->states.end(); ++siter) { - all_locations.insert (*siter); - } - } +void +Location::unlock () +{ + _locked = false; + lock_changed (this); + LockChanged (); +} + +void +Location::set_scene_change (boost::shared_ptr sc) +{ + _scene_change = sc; + + scene_changed (); /* EMIT SIGNAL */ +} + +/*---------------------------------------------------------------------- */ + +Locations::Locations (Session& s) + : SessionHandleRef (s) +{ + current_location = 0; +} - set_delete (&all_locations); +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) { - Glib::Mutex::Lock lm (lock); + Glib::Threads::Mutex::Lock lm (lock); ret = set_current_unlocked (loc); } else { ret = set_current_unlocked (loc); @@ -414,6 +778,62 @@ Locations::set_current (Location *loc, bool want_lock) return ret; } +int +Locations::next_available_name(string& result,string base) +{ + LocationList::iterator i; + string::size_type l; + int suffix; + char buf[32]; + std::map taken; + uint32_t n; + + result = base; + l = base.length(); + + 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)) { + + if ((suffix = atoi (temp.substr(l,3))) != 0) { + taken.insert (make_pair (suffix,true)); + } + } + } + } + + /* 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; +} + int Locations::set_current_unlocked (Location *loc) { @@ -421,7 +841,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; } @@ -430,64 +850,76 @@ void Locations::clear () { { - Glib::Mutex::Lock lm (lock); - LocationList::iterator tmp; + Glib::Threads::Mutex::Lock lm (lock); + for (LocationList::iterator i = locations.begin(); i != locations.end(); ) { - tmp = i; + + LocationList::iterator tmp = i; ++tmp; - if (!(*i)->is_end() && !(*i)->is_start()) { + + if (!(*i)->is_session_range()) { + delete *i; locations.erase (i); } + i = tmp; } - locations.clear (); current_location = 0; } - save_state (_("clear")); - changed (); /* EMIT SIGNAL */ current_changed (0); /* EMIT SIGNAL */ -} +} 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(); ) { tmp = i; ++tmp; - if ((*i)->is_mark() && !(*i)->is_end() && !(*i)->is_start()) { + if ((*i)->is_mark() && !(*i)->is_session_range()) { + delete *i; locations.erase (i); } i = tmp; } } - - save_state (_("clear markers")); - + 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(); ) { 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); } @@ -498,50 +930,53 @@ Locations::clear_ranges () current_location = 0; } - save_state (_("clear ranges")); - - changed (); /* EMIT SIGNAL */ + changed (); current_changed (0); /* EMIT SIGNAL */ -} +} 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) { current_location = loc; } } - - save_state (_("add")); added (loc); /* EMIT SIGNAL */ if (make_current) { current_changed (current_location); /* EMIT SIGNAL */ - } + } + + if (loc->is_session_range()) { + Session::StartTimeChanged (0); + Session::EndTimeChanged (1); + } } void Locations::remove (Location *loc) - { bool was_removed = false; bool was_current = false; LocationList::iterator i; - if (loc->is_end() || loc->is_start()) { + if (loc->is_session_range()) { return; } { - 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) { @@ -552,72 +987,120 @@ Locations::remove (Location *loc) } } } - - if (was_removed) { - save_state (_("remove")); - removed (loc); /* EMIT SIGNAL */ + if (was_removed) { + removed (loc); /* EMIT SIGNAL */ + if (was_current) { current_changed (0); /* EMIT SIGNAL */ } - - changed (); /* EMIT_SIGNAL */ } } -void -Locations::location_changed (Location* loc) -{ - save_state (X_("location changed")); - changed (); /* EMIT SIGNAL */ -} - XMLNode& Locations::get_state () { XMLNode *node = new XMLNode ("Locations"); LocationList::iterator iter; - Glib::Mutex::Lock lm (lock); - - for (iter = locations.begin(); iter != locations.end(); ++iter) { + Glib::Threads::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(); + + /* 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); + 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 (**niter); - locations.push_back (loc); + 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; + + 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(), true); + add = false; + } else if (s == X_("IsEnd")) { + session_range_location->set_end (loc->start(), true); + add = false; + } + + if (c == string::npos) { + break; + } + + v = v.substr (c + 1); + } + } + } + + if (add) { + new_locations.push_back (loc); + } } catch (failed_constructor& err) { error << _("could not load location from session file - ignored") << endmsg; } } - - if (locations.size()) { + locations = new_locations; + + if (locations.size()) { current_location = locations.front(); } else { current_location = 0; @@ -625,167 +1108,213 @@ Locations::set_state (const XMLNode& node) } changed (); /* EMIT SIGNAL */ - + return 0; -} +} + + +typedef std::pair LocationPair; -struct LocationStartEarlierComparison +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 +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 (nframes_t frame) +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 */ - - for (LocationList::iterator i = locs.begin(); i != locs.end(); ++i) { - if (!(*i)->is_hidden() && (*i)->start() < frame) { - return (*i); + /* locs is sorted in ascending order */ + + 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).first < frame) { + return (*i).first; } } - return 0; + return -1; } -Location * -Locations::first_location_after (nframes_t frame) +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. + */ - LocationStartEarlierComparison cmp; - locs.sort (cmp); + for (LocationList::const_iterator i = locations.begin(); i != locations.end(); ++i) { - /* locs is now sorted earliest..latest */ - - for (LocationList::iterator i = locs.begin(); i != locs.end(); ++i) { - if (!(*i)->is_hidden() && (*i)->start() > frame) { - return (*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 0; + return closest; } -nframes_t -Locations::first_mark_before (nframes_t frame) +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))); + } } - LocationStartLaterComparison cmp; - locs.sort (cmp); - - /* locs is now sorted latest..earliest */ + LocationStartEarlierComparison cmp; + sort (locs.begin(), locs.end(), cmp); - for (LocationList::iterator i = locs.begin(); i != locs.end(); ++i) { - if (!(*i)->is_hidden()) { - if ((*i)->is_mark()) { - /* MARK: start == end */ - if ((*i)->start() < frame) { - return (*i)->start(); - } - } else { - /* RANGE: start != end, compare start and end */ - if ((*i)->end() < frame) { - return (*i)->end(); - } - if ((*i)->start () < frame) { - return (*i)->start(); - } - } + /* locs is sorted in reverse order */ + + 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).first > frame) { + return (*i).first; } } - return 0; + return -1; } -nframes_t -Locations::first_mark_after (nframes_t frame) +/** 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_framepos if none exists) + * @param after Filled in with the position of the next `mark' after `frame' (or max_framepos if none exists) + */ +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; } - LocationStartEarlierComparison cmp; - locs.sort (cmp); + /* 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; + } - /* locs is now sorted earliest..latest */ - - for (LocationList::iterator i = locs.begin(); i != locs.end(); ++i) { if (!(*i)->is_hidden()) { - if ((*i)->is_mark()) { - /* MARK, start == end so just compare start */ - if ((*i)->start() > frame) { - return (*i)->start(); + if ((*i)->is_mark ()) { + if ((*i)->start() != frame) { + positions.push_back ((*i)->start ()); } } else { - /* RANGE, start != end, compare start and end */ - if ((*i)->start() > frame ) { - return (*i)->start (); + if ((*i)->start() != frame) { + positions.push_back ((*i)->start ()); } - if ((*i)->end() > frame) { - return (*i)->end (); + if ((*i)->end() != frame) { + positions.push_back ((*i)->end ()); } } } } - return max_frames; -} + if (positions.empty ()) { + return; + } -Location* -Locations::end_location () const -{ - for (LocationList::const_iterator i = locations.begin(); i != locations.end(); ++i) { - if ((*i)->is_end()) { - return const_cast (*i); - } + positions.sort (); + + std::list::iterator i = positions.begin (); + while (i != positions.end () && *i < frame) { + ++i; } - return 0; -} + + 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 @@ -796,7 +1325,7 @@ Locations::auto_loop_location () const } } return 0; -} +} Location* Locations::auto_punch_location () const @@ -807,52 +1336,13 @@ Locations::auto_punch_location () const } } return 0; -} - -StateManager::State* -Locations::state_factory (std::string why) const -{ - State* state = new State (why); - - state->locations = locations; - - for (LocationList::const_iterator i = locations.begin(); i != locations.end(); ++i) { - state->states.push_back (new Location (**i)); - } - - return state; -} - -Change -Locations::restore_state (StateManager::State& state) -{ - { - Glib::Mutex::Lock lm (lock); - 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); - } - } - - return Change (0); -} - -UndoAction -Locations::get_memento () const -{ - return sigc::bind (mem_fun (*(const_cast (this)), &StateManager::use_state), _current_state_id); } 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; @@ -865,9 +1355,23 @@ Location * Locations::get_location_by_id(PBD::ID id) { LocationList::iterator it; - for (it = locations.begin(); it != locations.end(); it++) + for (it = locations.begin(); it != locations.end(); ++it) if (id == (*it)->id()) return *it; return 0; } + +void +Locations::find_all_between (framepos_t start, framepos_t end, LocationList& ll, Location::Flags flags) +{ + Glib::Threads::Mutex::Lock lm (lock); + + for (LocationList::const_iterator i = locations.begin(); i != locations.end(); ++i) { + if ((flags == 0 || (*i)->matches (flags)) && + ((*i)->start() >= start && (*i)->end() < end)) { + ll.push_back (*i); + } + } +} +