X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Flocation.cc;h=04e36589eec177073297cd3e06f4595ef3b58453;hb=4250940ad83200e065b966d0646c75a48bb0f73d;hp=0a48b43d0eb71a1b85dfd40e4cdc85d032e7d56f;hpb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;p=ardour.git diff --git a/libs/ardour/location.cc b/libs/ardour/location.cc index 0a48b43d0e..04e36589ee 100644 --- a/libs/ardour/location.cc +++ b/libs/ardour/location.cc @@ -25,7 +25,7 @@ #include #include -#include "pbd/convert.h" +#include "pbd/types_convert.h" #include "pbd/stl_delete.h" #include "pbd/xml++.h" #include "pbd/enumwriter.h" @@ -35,9 +35,14 @@ #include "ardour/session.h" #include "ardour/audiofilesource.h" #include "ardour/tempo.h" +#include "ardour/types_convert.h" #include "pbd/i18n.h" +namespace PBD { + DEFINE_ENUM_CONVERT(ARDOUR::Location::Flags); +} + using namespace std; using namespace ARDOUR; using namespace PBD; @@ -54,7 +59,9 @@ PBD::Signal1 Location::changed; Location::Location (Session& s) : SessionHandleRef (s) , _start (0) + , _start_beat (0.0) , _end (0) + , _end_beat (0.0) , _flags (Flags (0)) , _locked (false) , _position_lock_style (AudioTime) @@ -64,7 +71,7 @@ Location::Location (Session& s) } /** 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) +Location::Location (Session& s, samplepos_t sample_start, samplepos_t sample_end, const std::string &name, Flags bits, const uint32_t sub_num) : SessionHandleRef (s) , _name (name) , _start (sample_start) @@ -74,7 +81,7 @@ Location::Location (Session& s, framepos_t sample_start, framepos_t sample_end, , _position_lock_style (s.config.get_glue_new_markers_to_bars_and_beats() ? MusicTime : AudioTime) { - recompute_bbt_from_frames (); + recompute_beat_from_samples (sub_num); assert (_start >= 0); assert (_end >= 0); @@ -85,9 +92,9 @@ Location::Location (const Location& other) , StatefulDestructible() , _name (other._name) , _start (other._start) - , _bbt_start (other._bbt_start) + , _start_beat (other._start_beat) , _end (other._end) - , _bbt_end (other._bbt_end) + , _end_beat (other._end_beat) , _flags (other._flags) , _position_lock_style (other._position_lock_style) @@ -125,8 +132,8 @@ 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 || + _start_beat != other._start_beat || + _end_beat != other._end_beat || _flags != other._flags || _position_lock_style != other._position_lock_style) { return false; @@ -143,9 +150,9 @@ Location::operator= (const Location& other) _name = other._name; _start = other._start; - _bbt_start = other._bbt_start; + _start_beat = other._start_beat; _end = other._end; - _bbt_end = other._bbt_end; + _end_beat = other._end_beat; _flags = other._flags; _position_lock_style = other._position_lock_style; @@ -178,10 +185,10 @@ Location::set_name (const std::string& str) /** 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. + * @param allow_beat_recompute True to recompute BEAT start time from the new given start time. */ int -Location::set_start (framepos_t s, bool force, bool allow_bbt_recompute) +Location::set_start (samplepos_t s, bool force, bool allow_beat_recompute, const uint32_t sub_num) { if (s < 0) { return -1; @@ -201,8 +208,8 @@ Location::set_start (framepos_t s, bool force, bool allow_bbt_recompute) if (_start != s) { _start = s; _end = s; - if (allow_bbt_recompute) { - recompute_bbt_from_frames (); + if (allow_beat_recompute) { + recompute_beat_from_samples (sub_num); } start_changed (this); /* EMIT SIGNAL */ @@ -232,11 +239,11 @@ Location::set_start (framepos_t s, bool force, bool allow_bbt_recompute) if (s != _start) { - framepos_t const old = _start; + samplepos_t const old = _start; _start = s; - if (allow_bbt_recompute) { - recompute_bbt_from_frames (); + if (allow_beat_recompute) { + recompute_beat_from_samples (sub_num); } start_changed (this); /* EMIT SIGNAL */ StartChanged (); /* EMIT SIGNAL */ @@ -255,10 +262,10 @@ Location::set_start (framepos_t s, bool force, bool allow_bbt_recompute) /** Set end position. * @param s New 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. + * @param allow_beat_recompute True to recompute BEAT end time from the new given end time. */ int -Location::set_end (framepos_t e, bool force, bool allow_bbt_recompute) +Location::set_end (samplepos_t e, bool force, bool allow_beat_recompute, const uint32_t sub_num) { if (e < 0) { return -1; @@ -278,8 +285,8 @@ Location::set_end (framepos_t e, bool force, bool allow_bbt_recompute) if (_start != e) { _start = e; _end = e; - if (allow_bbt_recompute) { - recompute_bbt_from_frames (); + if (allow_beat_recompute) { + recompute_beat_from_samples (sub_num); } //start_changed (this); /* EMIT SIGNAL */ //StartChanged (); /* EMIT SIGNAL */ @@ -300,11 +307,11 @@ Location::set_end (framepos_t e, bool force, bool allow_bbt_recompute) if (e != _end) { - framepos_t const old = _end; + samplepos_t const old = _end; _end = e; - if (allow_bbt_recompute) { - recompute_bbt_from_frames (); + if (allow_beat_recompute) { + recompute_beat_from_samples (sub_num); } end_changed(this); /* EMIT SIGNAL */ @@ -321,7 +328,7 @@ Location::set_end (framepos_t e, bool force, bool allow_bbt_recompute) } int -Location::set (framepos_t s, framepos_t e, bool allow_bbt_recompute) +Location::set (samplepos_t s, samplepos_t e, bool allow_beat_recompute, const uint32_t sub_num) { if (s < 0 || e < 0) { return -1; @@ -341,8 +348,8 @@ Location::set (framepos_t s, framepos_t e, bool allow_bbt_recompute) _start = s; _end = s; - if (allow_bbt_recompute) { - recompute_bbt_from_frames (); + if (allow_beat_recompute) { + recompute_beat_from_samples (sub_num); } start_change = true; @@ -361,11 +368,11 @@ Location::set (framepos_t s, framepos_t e, bool allow_bbt_recompute) if (s != _start) { - framepos_t const old = _start; + samplepos_t const old = _start; _start = s; - if (allow_bbt_recompute) { - recompute_bbt_from_frames (); + if (allow_beat_recompute) { + recompute_beat_from_samples (sub_num); } start_change = true; @@ -379,11 +386,11 @@ Location::set (framepos_t s, framepos_t e, bool allow_bbt_recompute) if (e != _end) { - framepos_t const old = _end; + samplepos_t const old = _end; _end = e; - if (allow_bbt_recompute) { - recompute_bbt_from_frames (); + if (allow_beat_recompute) { + recompute_beat_from_samples (sub_num); } end_change = true; @@ -411,7 +418,7 @@ Location::set (framepos_t s, framepos_t e, bool allow_bbt_recompute) } int -Location::move_to (framepos_t pos) +Location::move_to (samplepos_t pos, const uint32_t sub_num) { if (pos < 0) { return -1; @@ -424,7 +431,7 @@ Location::move_to (framepos_t pos) if (_start != pos) { _start = pos; _end = _start + length(); - recompute_bbt_from_frames (); + recompute_beat_from_samples (sub_num); changed (this); /* EMIT SIGNAL */ Changed (); /* EMIT SIGNAL */ @@ -554,8 +561,8 @@ Location::cd_info_node(const string & name, const string & value) { XMLNode* root = new XMLNode("CD-Info"); - root->add_property("name", name); - root->add_property("value", value); + root->set_property("name", name); + root->set_property("value", value); return *root; } @@ -565,7 +572,6 @@ XMLNode& Location::get_state () { XMLNode *node = new XMLNode ("Location"); - char buf[64]; typedef map::const_iterator CI; @@ -573,16 +579,17 @@ Location::get_state () 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), "%" PRId64, start()); - node->add_property ("start", buf); - snprintf (buf, sizeof (buf), "%" PRId64, end()); - node->add_property ("end", 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)); + node->set_property ("id", id ()); + node->set_property ("name", name()); + node->set_property ("start", start()); + node->set_property ("end", end()); + if (position_lock_style() == MusicTime) { + node->set_property ("start-beat", _start_beat); + node->set_property ("end-beat", _end_beat); + } + node->set_property ("flags", _flags); + node->set_property ("locked", _locked); + node->set_property ("position-lock-style", _position_lock_style); if (_scene_change) { node->add_child_nocopy (_scene_change->get_state()); @@ -594,8 +601,6 @@ Location::get_state () int Location::set_state (const XMLNode& node, int version) { - XMLProperty const * prop; - XMLNodeList cd_list = node.children(); XMLNodeConstIterator cd_iter; XMLNode *cd_node; @@ -612,46 +617,40 @@ Location::set_state (const XMLNode& node, int version) warning << _("XML node for Location has no ID information") << endmsg; } - if ((prop = node.property ("name")) == 0) { + std::string str; + if (!node.get_property ("name", str)) { 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; - return -1; - } + set_name (str); /* can't use set_start() here, because _end may make the value of _start illegal. */ - sscanf (prop->value().c_str(), "%" PRId64, &_start); + if (!node.get_property ("start", _start)) { + error << _("XML node for Location has no start information") << endmsg; + return -1; + } - if ((prop = node.property ("end")) == 0) { + if (!node.get_property ("end", _end)) { error << _("XML node for Location has no end information") << endmsg; return -1; } - sscanf (prop->value().c_str(), "%" PRId64, &_end); + Flags old_flags (_flags); - if ((prop = node.property ("flags")) == 0) { + if (!node.get_property ("flags", _flags)) { 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 { + if (!node.get_property ("locked", _locked)) { _locked = false; } @@ -663,25 +662,18 @@ Location::set_state (const XMLNode& node, int version) continue; } - if ((prop = cd_node->property ("name")) != 0) { - cd_name = prop->value(); - } else { + if (!cd_node->get_property ("name", cd_name)) { throw failed_constructor (); } - if ((prop = cd_node->property ("value")) != 0) { - cd_value = prop->value(); - } else { + if (!cd_node->get_property ("value", cd_value)) { throw failed_constructor (); } - 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)); - } + node.get_property ("position-lock-style", _position_lock_style); XMLNode* scene_child = find_named_node (node, SceneChange::xml_node_name); @@ -689,7 +681,16 @@ Location::set_state (const XMLNode& node, int version) _scene_change = SceneChange::factory (*scene_child, version); } - recompute_bbt_from_frames (); + if (position_lock_style() == AudioTime) { + recompute_beat_from_samples (0); + } else{ + /* music */ + if (!node.get_property ("start-beat", _start_beat) || + !node.get_property ("end-beat", _end_beat)) { + recompute_beat_from_samples (0); + } + } + changed (this); /* EMIT SIGNAL */ Changed (); /* EMIT SIGNAL */ @@ -709,32 +710,30 @@ Location::set_position_lock_style (PositionLockStyle ps) _position_lock_style = ps; - recompute_bbt_from_frames (); + if (ps == MusicTime) { + recompute_beat_from_samples (0); + } position_lock_style_changed (this); /* EMIT SIGNAL */ PositionLockStyleChanged (); /* EMIT SIGNAL */ } void -Location::recompute_bbt_from_frames () +Location::recompute_beat_from_samples (const uint32_t sub_num) { - if (_position_lock_style != MusicTime) { - return; - } - - _bbt_start = _session.tempo_map().beat_at_frame (_start); - _bbt_end = _session.tempo_map().beat_at_frame (_end); + _start_beat = _session.tempo_map().exact_beat_at_sample (_start, sub_num); + _end_beat = _session.tempo_map().exact_beat_at_sample (_end, sub_num); } void -Location::recompute_frames_from_bbt () +Location::recompute_samples_from_beat () { if (_position_lock_style != MusicTime) { return; } TempoMap& map (_session.tempo_map()); - set (map.frame_at_beat (_bbt_start), map.frame_at_beat (_bbt_end), false); + set (map.sample_at_beat (_start_beat), map.sample_at_beat (_end_beat), false); } void @@ -994,6 +993,10 @@ Locations::remove (Location *loc) bool was_current = false; LocationList::iterator i; + if (!loc) { + return; + } + if (loc->is_session_range()) { return; } @@ -1003,6 +1006,7 @@ Locations::remove (Location *loc) for (i = locations.begin(); i != locations.end(); ++i) { if ((*i) == loc) { + bool was_loop = (*i)->is_auto_loop(); delete *i; locations.erase (i); was_removed = true; @@ -1010,6 +1014,12 @@ Locations::remove (Location *loc) current_location = 0; was_current = true; } + if (was_loop) { + if (_session.get_play_loop()) { + _session.request_play_loop (false, false); + } + _session.auto_loop_location_changed (0); + } break; } } @@ -1056,7 +1066,7 @@ Locations::set_state (const XMLNode& node, int version) Location* session_range_location = 0; if (version < 3000) { - session_range_location = new Location (_session, 0, 0, _("session"), Location::IsSessionRange); + session_range_location = new Location (_session, 0, 0, _("session"), Location::IsSessionRange, 0); new_locations.push_back (session_range_location); } @@ -1166,7 +1176,7 @@ Locations::set_state (const XMLNode& node, int version) } -typedef std::pair LocationPair; +typedef std::pair LocationPair; struct LocationStartEarlierComparison { @@ -1182,8 +1192,8 @@ struct LocationStartLaterComparison } }; -framepos_t -Locations::first_mark_before (framepos_t frame, bool include_special_ranges) +samplepos_t +Locations::first_mark_before (samplepos_t sample, bool include_special_ranges) { Glib::Threads::Mutex::Lock lm (lock); vector locs; @@ -1207,7 +1217,7 @@ Locations::first_mark_before (framepos_t frame, bool include_special_ranges) if (!include_special_ranges && ((*i).second->is_auto_loop() || (*i).second->is_auto_punch())) { continue; } - if ((*i).first < frame) { + if ((*i).first < sample) { return (*i).first; } } @@ -1216,12 +1226,12 @@ Locations::first_mark_before (framepos_t frame, bool include_special_ranges) } Location* -Locations::mark_at (framepos_t pos, framecnt_t slop) const +Locations::mark_at (samplepos_t pos, samplecnt_t slop) const { Glib::Threads::Mutex::Lock lm (lock); Location* closest = 0; - frameoffset_t mindelta = max_framepos; - frameoffset_t delta; + sampleoffset_t mindelta = max_samplepos; + sampleoffset_t delta; /* 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. @@ -1253,8 +1263,8 @@ Locations::mark_at (framepos_t pos, framecnt_t slop) const return closest; } -framepos_t -Locations::first_mark_after (framepos_t frame, bool include_special_ranges) +samplepos_t +Locations::first_mark_after (samplepos_t sample, bool include_special_ranges) { Glib::Threads::Mutex::Lock lm (lock); vector locs; @@ -1278,7 +1288,7 @@ Locations::first_mark_after (framepos_t frame, bool include_special_ranges) if (!include_special_ranges && ((*i).second->is_auto_loop() || (*i).second->is_auto_punch())) { continue; } - if ((*i).first > frame) { + if ((*i).first > sample) { return (*i).first; } } @@ -1287,16 +1297,16 @@ Locations::first_mark_after (framepos_t frame, bool include_special_ranges) } /** 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 + * side of a sample. Note that if sample 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) + * @param sample Frame to look for. + * @param before Filled in with the position of the last `mark' before `sample' (or max_samplepos if none exists) + * @param after Filled in with the position of the next `mark' after `sample' (or max_samplepos if none exists) */ void -Locations::marks_either_side (framepos_t const frame, framepos_t& before, framepos_t& after) const +Locations::marks_either_side (samplepos_t const sample, samplepos_t& before, samplepos_t& after) const { - before = after = max_framepos; + before = after = max_samplepos; LocationList locs; @@ -1307,7 +1317,7 @@ Locations::marks_either_side (framepos_t const frame, framepos_t& before, framep /* Get a list of positions; don't store any that are exactly on our requested position */ - std::list positions; + std::list positions; for (LocationList::const_iterator i = locs.begin(); i != locs.end(); ++i) { if (((*i)->is_auto_loop() || (*i)->is_auto_punch())) { @@ -1316,14 +1326,14 @@ Locations::marks_either_side (framepos_t const frame, framepos_t& before, framep if (!(*i)->is_hidden()) { if ((*i)->is_mark ()) { - if ((*i)->start() != frame) { + if ((*i)->start() != sample) { positions.push_back ((*i)->start ()); } } else { - if ((*i)->start() != frame) { + if ((*i)->start() != sample) { positions.push_back ((*i)->start ()); } - if ((*i)->end() != frame) { + if ((*i)->end() != sample) { positions.push_back ((*i)->end ()); } } @@ -1336,8 +1346,8 @@ Locations::marks_either_side (framepos_t const frame, framepos_t& before, framep positions.sort (); - std::list::iterator i = positions.begin (); - while (i != positions.end () && *i < frame) { + std::list::iterator i = positions.begin (); + while (i != positions.end () && *i < sample) { ++i; } @@ -1416,7 +1426,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) +Locations::find_all_between (samplepos_t start, samplepos_t end, LocationList& ll, Location::Flags flags) { Glib::Threads::Mutex::Lock lm (lock); @@ -1427,4 +1437,3 @@ Locations::find_all_between (framepos_t start, framepos_t end, LocationList& ll, } } } -