X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Flocation.cc;h=1b63ce4431cf3b86f8ceefe8afa824088a37734d;hb=18713b7d1fc4a1fcec0a60f2c80a327b50b9c529;hp=2e9125126b4c69ea2e617abebdeb489a87a95e53;hpb=e874bc0be141405749f7359446a21f8c89c375c1;p=ardour.git diff --git a/libs/ardour/location.cc b/libs/ardour/location.cc index 2e9125126b..1b63ce4431 100644 --- a/libs/ardour/location.cc +++ b/libs/ardour/location.cc @@ -72,6 +72,7 @@ Location::Location (Session& s, framepos_t sample_start, framepos_t 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 (); @@ -89,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 */ @@ -102,6 +104,7 @@ Location::Location (const Location& other) 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 @@ -145,7 +148,7 @@ Location::operator= (const Location& other) _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 */ @@ -165,11 +168,11 @@ Location::operator= (const Location& other) void Location::set_name (const std::string& str) -{ - _name = str; +{ + _name = str; - name_changed (this); /* EMIT SIGNAL */ - NameChanged (); /* EMIT SIGNAL */ + name_changed (this); /* EMIT SIGNAL */ + NameChanged (); /* EMIT SIGNAL */ } /** Set start position. @@ -221,11 +224,11 @@ Location::set_start (framepos_t s, bool force, bool allow_bbt_recompute) return 0; } else if (!force) { - /* range locations must exceed a minimum duration */ - if (_end - s < Config->get_range_location_minimum()) { - return -1; - } - } + /* range locations must exceed a minimum duration */ + if (_end - s < Config->get_range_location_minimum()) { + return -1; + } + } if (s != _start) { @@ -237,7 +240,7 @@ Location::set_start (framepos_t s, bool force, bool allow_bbt_recompute) } start_changed (this); /* EMIT SIGNAL */ StartChanged (); /* EMIT SIGNAL */ - + if (is_session_range ()) { Session::StartTimeChanged (old); /* EMIT SIGNAL */ AudioFileSource::set_header_position_offset (s); @@ -288,11 +291,11 @@ Location::set_end (framepos_t e, bool force, bool allow_bbt_recompute) 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; - } + } else if (!force) { + /* range locations must exceed a minimum duration */ + if (e - _start < Config->get_range_location_minimum()) { + return -1; + } } if (e != _end) { @@ -329,8 +332,8 @@ Location::set (framepos_t s, framepos_t e, bool allow_bbt_recompute) return -1; } - bool start_change = false; - bool end_change = false; + bool start_change = false; + bool end_change = false; if (is_mark()) { @@ -342,8 +345,8 @@ Location::set (framepos_t s, framepos_t e, bool allow_bbt_recompute) recompute_bbt_from_frames (); } - start_change = true; - end_change = true; + start_change = true; + end_change = true; } assert (_start >= 0); @@ -351,64 +354,64 @@ Location::set (framepos_t s, framepos_t e, bool allow_bbt_recompute) } 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); - } + /* range locations must exceed a minimum duration */ + if (e - s < Config->get_range_location_minimum()) { + return -1; + } - if (start_change) { - start_changed(this); /* EMIT SIGNAL */ - StartChanged(); /* EMIT SIGNAL */ - } + if (s != _start) { - if (end_change) { - end_changed(this); /* EMIT SIGNAL */ - EndChanged(); /* EMIT SIGNAL */ - } + framepos_t const old = _start; + _start = s; - if (start_change && end_change) { - changed (this); - Changed (); - } + 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) { - return 0; + 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 @@ -441,8 +444,8 @@ void Location::set_hidden (bool yn, void*) { if (set_flag_internal (yn, IsHidden)) { - flags_changed (this); /* EMIT SIGNAL */ - FlagsChanged (); + flags_changed (this); /* EMIT SIGNAL */ + FlagsChanged (); } } @@ -458,40 +461,40 @@ Location::set_cd (bool yn, void*) } if (set_flag_internal (yn, IsCDMarker)) { - flags_changed (this); /* EMIT SIGNAL */ - FlagsChanged (); + 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 */ - } + if (set_flag_internal (yn, IsRangeMarker)) { + flags_changed (this); + FlagsChanged (); /* EMIT SIGNAL */ + } } void Location::set_skip (bool yn) { - if (is_range_marker() && length() > 0) { - if (set_flag_internal (yn, IsSkip)) { - flags_changed (this); - FlagsChanged (); - } - } + 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 (); - } - } + if (is_range_marker() && is_skip() && length() > 0) { + if (set_flag_internal (yn, IsSkipping)) { + flags_changed (this); + FlagsChanged (); + } + } } void @@ -502,8 +505,8 @@ Location::set_auto_punch (bool yn, void*) } if (set_flag_internal (yn, IsAutoPunch)) { - flags_changed (this); /* EMIT SIGNAL */ - FlagsChanged (); /* EMIT SIGNAL */ + flags_changed (this); /* EMIT SIGNAL */ + FlagsChanged (); /* EMIT SIGNAL */ } } @@ -515,8 +518,8 @@ Location::set_auto_loop (bool yn, void*) } if (set_flag_internal (yn, IsAutoLoop)) { - flags_changed (this); /* EMIT SIGNAL */ - FlagsChanged (); /* EMIT SIGNAL */ + flags_changed (this); /* EMIT SIGNAL */ + FlagsChanged (); /* EMIT SIGNAL */ } } @@ -625,26 +628,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 { @@ -653,26 +661,26 @@ 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) { @@ -680,7 +688,7 @@ Location::set_state (const XMLNode& node, int version) } XMLNode* scene_child = find_named_node (node, SceneChange::xml_node_name); - + if (scene_child) { _scene_change = SceneChange::factory (*scene_child, version); } @@ -752,9 +760,13 @@ Location::unlock () void Location::set_scene_change (boost::shared_ptr sc) { - _scene_change = sc; + if (_scene_change != sc) { + _scene_change = sc; + _session.set_dirty (); - scene_changed (); /* EMIT SIGNAL */ + scene_changed (); /* EMIT SIGNAL */ + SceneChangeChanged (); /* EMIT SIGNAL */ + } } /*---------------------------------------------------------------------- */ @@ -788,7 +800,7 @@ Locations::set_current (Location *loc, bool want_lock) } if (ret == 0) { - current_changed (current_location); /* EMIT SIGNAL */ + current_changed (current_location); /* EMIT SIGNAL */ } return ret; } @@ -800,52 +812,56 @@ Locations::next_available_name(string& result,string base) string::size_type l; int suffix; char buf[32]; - std::map taken; - uint32_t n; + std::map taken; + uint32_t n; result = base; - l = base.length(); + 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" - */ + if (!base.empty()) { - for (i = locations.begin(); i != locations.end(); ++i) { + /* find all existing names that match "base", and store + the numeric part of them (if any) in the map "taken" + */ - const string& temp ((*i)->name()); - - if (!temp.find (base,0)) { + for (i = locations.begin(); i != locations.end(); ++i) { - if ((suffix = atoi (temp.substr(l,3))) != 0) { - taken.insert (make_pair (suffix,true)); - } - } - } - } + 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)); + } + } + } + } + + /* 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; + } - /* 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; } @@ -906,7 +922,7 @@ Locations::clear_markers () i = tmp; } } - + changed (); /* EMIT SIGNAL */ } @@ -945,7 +961,7 @@ Locations::clear_ranges () current_location = 0; } - changed (); + changed (); current_changed (0); /* EMIT SIGNAL */ } @@ -966,7 +982,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()) { @@ -1006,9 +1022,9 @@ Locations::remove (Location *loc) if (was_removed) { removed (loc); /* EMIT SIGNAL */ - + if (was_current) { - current_changed (0); /* EMIT SIGNAL */ + current_changed (0); /* EMIT SIGNAL */ } } } @@ -1069,6 +1085,8 @@ Locations::set_state (const XMLNode& node, int version) 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); @@ -1113,6 +1131,30 @@ 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()) { @@ -1132,16 +1174,16 @@ typedef std::pair LocationPair; struct LocationStartEarlierComparison { - bool operator() (LocationPair a, LocationPair b) { - return a.first < b.first; - } + bool operator() (LocationPair a, LocationPair b) { + return a.first < b.first; + } }; struct LocationStartLaterComparison { - bool operator() (LocationPair a, LocationPair b) { - return a.first > b.first; - } + bool operator() (LocationPair a, LocationPair b) { + return a.first > b.first; + } }; framepos_t @@ -1149,7 +1191,7 @@ Locations::first_mark_before (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()) { @@ -1192,12 +1234,12 @@ Locations::mark_at (framepos_t pos, framecnt_t slop) const for (LocationList::const_iterator i = locations.begin(); i != locations.end(); ++i) { if ((*i)->is_mark()) { - if (pos > (*i)->start()) { + 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; @@ -1230,7 +1272,7 @@ Locations::first_mark_after (framepos_t frame, bool include_special_ranges) LocationStartEarlierComparison cmp; sort (locs.begin(), locs.end(), cmp); - + /* locs is sorted in reverse order */ for (vector::iterator i = locs.begin(); i != locs.end(); ++i) { @@ -1350,7 +1392,7 @@ Locations::auto_punch_location () const return const_cast (*i); } } - return 0; + return 0; } uint32_t @@ -1369,12 +1411,12 @@ 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