X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=libs%2Fardour%2Fregion.cc;h=ba18cbc62db3d440efe873c3f558e3780d3c2824;hb=b2be7cb6bd797f40d998a80d61cc88a75632b193;hp=3bd51e1f18ff229ec5bd7e5776f074f3b0686995;hpb=ad735690fe4eaba54d99357f1abcbba2fb70b693;p=ardour.git diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc index 3bd51e1f18..ba18cbc62d 100644 --- a/libs/ardour/region.cc +++ b/libs/ardour/region.cc @@ -36,6 +36,7 @@ #include "ardour/session.h" #include "ardour/source.h" #include "ardour/tempo.h" +#include "ardour/transient_detector.h" #include "i18n.h" @@ -80,55 +81,55 @@ void Region::make_property_quarks () { Properties::muted.property_id = g_quark_from_static_string (X_("muted")); - DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for muted = %1\n", Properties::muted.property_id)); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for muted = %1\n", Properties::muted.property_id)); Properties::opaque.property_id = g_quark_from_static_string (X_("opaque")); - DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for opaque = %1\n", Properties::opaque.property_id)); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for opaque = %1\n", Properties::opaque.property_id)); Properties::locked.property_id = g_quark_from_static_string (X_("locked")); - DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for locked = %1\n", Properties::locked.property_id)); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for locked = %1\n", Properties::locked.property_id)); Properties::video_locked.property_id = g_quark_from_static_string (X_("video-locked")); - DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for video-locked = %1\n", Properties::video_locked.property_id)); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for video-locked = %1\n", Properties::video_locked.property_id)); Properties::automatic.property_id = g_quark_from_static_string (X_("automatic")); - DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for automatic = %1\n", Properties::automatic.property_id)); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for automatic = %1\n", Properties::automatic.property_id)); Properties::whole_file.property_id = g_quark_from_static_string (X_("whole-file")); - DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for whole-file = %1\n", Properties::whole_file.property_id)); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for whole-file = %1\n", Properties::whole_file.property_id)); Properties::import.property_id = g_quark_from_static_string (X_("import")); - DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for import = %1\n", Properties::import.property_id)); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for import = %1\n", Properties::import.property_id)); Properties::external.property_id = g_quark_from_static_string (X_("external")); - DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for external = %1\n", Properties::external.property_id)); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for external = %1\n", Properties::external.property_id)); Properties::sync_marked.property_id = g_quark_from_static_string (X_("sync-marked")); - DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for sync-marked = %1\n", Properties::sync_marked.property_id)); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for sync-marked = %1\n", Properties::sync_marked.property_id)); Properties::left_of_split.property_id = g_quark_from_static_string (X_("left-of-split")); - DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for left-of-split = %1\n", Properties::left_of_split.property_id)); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for left-of-split = %1\n", Properties::left_of_split.property_id)); Properties::right_of_split.property_id = g_quark_from_static_string (X_("right-of-split")); - DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for right-of-split = %1\n", Properties::right_of_split.property_id)); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for right-of-split = %1\n", Properties::right_of_split.property_id)); Properties::hidden.property_id = g_quark_from_static_string (X_("hidden")); - DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for hidden = %1\n", Properties::hidden.property_id)); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for hidden = %1\n", Properties::hidden.property_id)); Properties::position_locked.property_id = g_quark_from_static_string (X_("position-locked")); - DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for position-locked = %1\n", Properties::position_locked.property_id)); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for position-locked = %1\n", Properties::position_locked.property_id)); Properties::valid_transients.property_id = g_quark_from_static_string (X_("valid-transients")); - DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for valid-transients = %1\n", Properties::valid_transients.property_id)); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for valid-transients = %1\n", Properties::valid_transients.property_id)); Properties::start.property_id = g_quark_from_static_string (X_("start")); - DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for start = %1\n", Properties::start.property_id)); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for start = %1\n", Properties::start.property_id)); Properties::length.property_id = g_quark_from_static_string (X_("length")); - DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for length = %1\n", Properties::length.property_id)); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for length = %1\n", Properties::length.property_id)); Properties::position.property_id = g_quark_from_static_string (X_("position")); - DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for position = %1\n", Properties::position.property_id)); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for position = %1\n", Properties::position.property_id)); Properties::sync_position.property_id = g_quark_from_static_string (X_("sync-position")); - DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for sync-position = %1\n", Properties::sync_position.property_id)); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for sync-position = %1\n", Properties::sync_position.property_id)); Properties::layer.property_id = g_quark_from_static_string (X_("layer")); - DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for layer = %1\n", Properties::layer.property_id)); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for layer = %1\n", Properties::layer.property_id)); Properties::ancestral_start.property_id = g_quark_from_static_string (X_("ancestral-start")); - DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for ancestral-start = %1\n", Properties::ancestral_start.property_id)); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for ancestral-start = %1\n", Properties::ancestral_start.property_id)); Properties::ancestral_length.property_id = g_quark_from_static_string (X_("ancestral-length")); - DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for ancestral-length = %1\n", Properties::ancestral_length.property_id)); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for ancestral-length = %1\n", Properties::ancestral_length.property_id)); Properties::stretch.property_id = g_quark_from_static_string (X_("stretch")); - DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for stretch = %1\n", Properties::stretch.property_id)); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for stretch = %1\n", Properties::stretch.property_id)); Properties::shift.property_id = g_quark_from_static_string (X_("shift")); - DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for shift = %1\n", Properties::shift.property_id)); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for shift = %1\n", Properties::shift.property_id)); Properties::position_lock_style.property_id = g_quark_from_static_string (X_("positional-lock-style")); - DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for position_lock_style = %1\n", Properties::position_lock_style.property_id)); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for position_lock_style = %1\n", Properties::position_lock_style.property_id)); Properties::layering_index.property_id = g_quark_from_static_string (X_("layering-index")); - DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for layering_index = %1\n", Properties::layering_index.property_id)); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for layering_index = %1\n", Properties::layering_index.property_id)); } void @@ -171,6 +172,9 @@ Region::register_properties () , _length (Properties::length, (l)) \ , _position (Properties::position, 0) \ , _sync_position (Properties::sync_position, (s)) \ + , _transient_user_start (0) \ + , _transient_analysis_start (0) \ + , _transient_analysis_end (0) \ , _muted (Properties::muted, false) \ , _opaque (Properties::opaque, true) \ , _locked (Properties::locked, false) \ @@ -197,7 +201,12 @@ Region::register_properties () , _length(Properties::length, other->_length) \ , _position(Properties::position, other->_position) \ , _sync_position(Properties::sync_position, other->_sync_position) \ - , _muted (Properties::muted, other->_muted) \ + , _user_transients (other->_user_transients) \ + , _transient_user_start (other->_transient_user_start) \ + , _transients (other->_transients) \ + , _transient_analysis_start (other->_transient_analysis_start) \ + , _transient_analysis_end (other->_transient_analysis_end) \ + , _muted (Properties::muted, other->_muted) \ , _opaque (Properties::opaque, other->_opaque) \ , _locked (Properties::locked, other->_locked) \ , _video_locked (Properties::video_locked, other->_video_locked) \ @@ -264,7 +273,7 @@ Region::Region (boost::shared_ptr other) /* override state that may have been incorrectly inherited from the other region */ - _position = 0; + _position = other->_position; _locked = false; _whole_file = false; _hidden = false; @@ -275,7 +284,8 @@ Region::Region (boost::shared_ptr other) _position_lock_style = other->_position_lock_style; _first_edit = other->_first_edit; - _start = 0; // It seems strange _start is not inherited here? + _start = other->_start; + _beat = other->_beat; /* sync pos is relative to start of file. our start-in-file is now zero, so set our sync position to whatever the the difference between @@ -317,6 +327,7 @@ Region::Region (boost::shared_ptr other, frameoffset_t offset) , _last_length (other->_last_length) , _last_position(other->_last_position) \ , _first_edit (EditChangesNothing) + , _beat (0.0) , _layer (other->_layer) { register_properties (); @@ -324,7 +335,7 @@ Region::Region (boost::shared_ptr other, frameoffset_t offset) /* override state that may have been incorrectly inherited from the other region */ - _position = 0; + _position = other->_position + offset; _locked = false; _whole_file = false; _hidden = false; @@ -333,6 +344,7 @@ Region::Region (boost::shared_ptr other, frameoffset_t offset) set_master_sources (other->_master_sources); _start = other->_start + offset; + _beat = _session.tempo_map().beat_at_frame (_position); /* if the other region had a distinct sync point set, then continue to use it as best we can. @@ -429,12 +441,11 @@ Region::set_length (framecnt_t len) } - _last_length = _length; set_length_internal (len); _whole_file = false; first_edit (); maybe_uncopy (); - invalidate_transients (); + maybe_invalidate_transients (); if (!property_changes_suspended()) { recompute_at_end (); @@ -447,6 +458,7 @@ Region::set_length (framecnt_t len) void Region::set_length_internal (framecnt_t len) { + _last_length = _length; _length = len; } @@ -529,7 +541,7 @@ Region::set_position_lock_style (PositionLockStyle ps) _position_lock_style = ps; if (_position_lock_style == MusicTime) { - _session.bbt_time (_position, _bbt_time); + _beat = _session.tempo_map().beat_at_frame (_position); } send_change (Properties::position_lock_style); @@ -537,7 +549,7 @@ Region::set_position_lock_style (PositionLockStyle ps) } void -Region::update_after_tempo_map_change () +Region::update_after_tempo_map_change (bool send) { boost::shared_ptr pl (playlist()); @@ -545,14 +557,16 @@ Region::update_after_tempo_map_change () return; } - TempoMap& map (_session.tempo_map()); - framepos_t pos = map.frame_time (_bbt_time); + const framepos_t pos = _session.tempo_map().frame_at_beat (_beat); set_position_internal (pos, false); /* do this even if the position is the same. this helps out a GUI that has moved its representation already. */ - send_change (Properties::position); + + if (send) { + send_change (Properties::position); + } } void @@ -567,7 +581,19 @@ Region::set_position (framepos_t pos) /* do this even if the position is the same. this helps out a GUI that has moved its representation already. */ - send_change (Properties::position); + PropertyChange p_and_l; + + p_and_l.add (Properties::position); + /* Currently length change due to position change is only implemented + for MidiRegion (Region has no length in beats). + Notify a length change regardless (its more efficient for MidiRegions), + and when Region has a _length_beats we will need it here anyway). + */ + if (position_lock_style() == MusicTime) { + p_and_l.add (Properties::length); + } + + send_change (p_and_l); } @@ -621,22 +647,18 @@ Region::set_position_internal (framepos_t pos, bool allow_bbt_recompute) if (_position != pos) { _position = pos; + if (allow_bbt_recompute) { + recompute_position_from_lock_style (); + } /* check that the new _position wouldn't make the current length impossible - if so, change the length. XXX is this the right thing to do? */ - if (max_framepos - _length < _position) { _last_length = _length; _length = max_framepos - _position; } - - if (allow_bbt_recompute) { - recompute_position_from_lock_style (); - } - - //invalidate_transients (); } } @@ -644,7 +666,7 @@ void Region::recompute_position_from_lock_style () { if (_position_lock_style == MusicTime) { - _session.bbt_time (_position, _bbt_time); + _beat = _session.tempo_map().beat_at_frame (_position); } } @@ -709,7 +731,7 @@ Region::set_start (framepos_t pos) set_start_internal (pos); _whole_file = false; first_edit (); - invalidate_transients (); + maybe_invalidate_transients (); send_change (Properties::start); } @@ -797,7 +819,6 @@ Region::modify_front (framepos_t new_position, bool reset_fade) if (new_position < end) { /* can't trim it zero or negative length */ framecnt_t newlen = 0; - framepos_t delta = 0; if (!can_trim_start_before_source_start ()) { /* can't trim it back past where source position zero is located */ @@ -806,10 +827,8 @@ Region::modify_front (framepos_t new_position, bool reset_fade) if (new_position > _position) { newlen = _length - (new_position - _position); - delta = -1 * (new_position - _position); } else { newlen = _length + (_position - new_position); - delta = _position - new_position; } trim_to_internal (new_position, newlen); @@ -822,9 +841,7 @@ Region::modify_front (framepos_t new_position, bool reset_fade) recompute_at_start (); } - if (_transients.size() > 0){ - adjust_transients(delta); - } + maybe_invalidate_transients (); } } @@ -913,6 +930,7 @@ Region::trim_to_internal (framepos_t position, framecnt_t length) what_changed.add (Properties::start); } + /* Set position before length, otherwise for MIDI regions this bad thing happens: * 1. we call set_length_internal; length in beats is computed using the region's current * (soon-to-be old) position @@ -1156,7 +1174,7 @@ Region::state () XMLNode *node = new XMLNode ("Region"); char buf[64]; char buf2[64]; - LocaleGuard lg (X_("C")); + LocaleGuard lg; const char* fe = NULL; /* custom version of 'add_properties (*node);' @@ -1196,9 +1214,8 @@ Region::state () /* note: flags are stored by derived classes */ if (_position_lock_style != AudioTime) { - stringstream str; - str << _bbt_time; - node->add_property ("bbt-position", str.str()); + snprintf (buf, sizeof(buf), "%lf", _beat); + node->add_property ("beat", buf); } for (uint32_t n=0; n < _sources.size(); ++n) { @@ -1258,7 +1275,8 @@ Region::set_state (const XMLNode& node, int version) int Region::_set_state (const XMLNode& node, int /*version*/, PropertyChange& what_changed, bool send) { - const XMLProperty* prop; + XMLProperty const * prop; + Timecode::BBT_Time bbt_time; Stateful::save_extra_xml (node); @@ -1268,14 +1286,23 @@ Region::_set_state (const XMLNode& node, int /*version*/, PropertyChange& what_c if (_position_lock_style == MusicTime) { if ((prop = node.property ("bbt-position")) == 0) { - /* missing BBT info, revert to audio time locking */ - _position_lock_style = AudioTime; + if ((prop = node.property ("beat")) == 0) { + /* missing BBT info, revert to audio time locking */ + _position_lock_style = AudioTime; + } else { + if (sscanf (prop->value().c_str(), "%lf", &_beat) != 1) { + _position_lock_style = AudioTime; + } + } + } else { if (sscanf (prop->value().c_str(), "%d|%d|%d", - &_bbt_time.bars, - &_bbt_time.beats, - &_bbt_time.ticks) != 3) { + &bbt_time.bars, + &bbt_time.beats, + &bbt_time.ticks) != 3) { _position_lock_style = AudioTime; + } else { + _beat = _session.tempo_map().beat_at_bbt (bbt_time); } } } @@ -1303,7 +1330,7 @@ Region::_set_state (const XMLNode& node, int /*version*/, PropertyChange& what_c } // saved property is invalid, region-transients are not saved - if (_transients.size() == 0){ + if (_user_transients.size() == 0){ _valid_transients = false; } @@ -1495,19 +1522,59 @@ Region::source_string () const return res.str(); } +void +Region::deep_sources (std::set > & sources) const +{ + for (SourceList::const_iterator i = _sources.begin(); i != _sources.end(); ++i) { + + boost::shared_ptr ps = boost::dynamic_pointer_cast (*i); + + if (ps) { + if (sources.find (ps) == sources.end()) { + /* (Playlist)Source not currently in + accumulating set, so recurse. + */ + ps->playlist()->deep_sources (sources); + } + } + + /* add this source */ + sources.insert (*i); + } + + for (SourceList::const_iterator i = _master_sources.begin(); i != _master_sources.end(); ++i) { + + boost::shared_ptr ps = boost::dynamic_pointer_cast (*i); + + if (ps) { + if (sources.find (ps) == sources.end()) { + /* (Playlist)Source not currently in + accumulating set, so recurse. + */ + ps->playlist()->deep_sources (sources); + } + } + + /* add this source */ + sources.insert (*i); + } +} + bool -Region::uses_source (boost::shared_ptr source) const +Region::uses_source (boost::shared_ptr source, bool shallow) const { for (SourceList::const_iterator i = _sources.begin(); i != _sources.end(); ++i) { if (*i == source) { return true; } - boost::shared_ptr ps = boost::dynamic_pointer_cast (*i); + if (!shallow) { + boost::shared_ptr ps = boost::dynamic_pointer_cast (*i); - if (ps) { - if (ps->playlist()->uses_source (source)) { - return true; + if (ps) { + if (ps->playlist()->uses_source (source)) { + return true; + } } } } @@ -1517,11 +1584,13 @@ Region::uses_source (boost::shared_ptr source) const return true; } - boost::shared_ptr ps = boost::dynamic_pointer_cast (*i); + if (!shallow) { + boost::shared_ptr ps = boost::dynamic_pointer_cast (*i); - if (ps) { - if (ps->playlist()->uses_source (source)) { - return true; + if (ps) { + if (ps->playlist()->uses_source (source)) { + return true; + } } } } @@ -1529,6 +1598,7 @@ Region::uses_source (boost::shared_ptr source) const return false; } + framecnt_t Region::source_length(uint32_t n) const { @@ -1627,12 +1697,60 @@ Region::apply (Filter& filter, Progress* progress) void -Region::invalidate_transients () +Region::maybe_invalidate_transients () { - _valid_transients = false; - _transients.clear (); + bool changed = !_onsets.empty(); + _onsets.clear (); - send_change (PropertyChange (Properties::valid_transients)); + if (_valid_transients || changed) { + send_change (PropertyChange (Properties::valid_transients)); + return; + } +} + +void +Region::transients (AnalysisFeatureList& afl) +{ + int cnt = afl.empty() ? 0 : 1; + + Region::merge_features (afl, _onsets, _position); + Region::merge_features (afl, _user_transients, _position + _transient_user_start - _start); + if (!_onsets.empty ()) { + ++cnt; + } + if (!_user_transients.empty ()) { + ++cnt; + } + if (cnt > 1 ) { + afl.sort (); + // remove exact duplicates + TransientDetector::cleanup_transients (afl, _session.frame_rate(), 0); + } +} + +bool +Region::has_transients () const +{ + if (!_user_transients.empty ()) { + assert (_valid_transients); + return true; + } + if (!_onsets.empty ()) { + return true; + } + return false; +} + +void +Region::merge_features (AnalysisFeatureList& result, const AnalysisFeatureList& src, const frameoffset_t off) const +{ + for (AnalysisFeatureList::const_iterator x = src.begin(); x != src.end(); ++x) { + const frameoffset_t p = (*x) + off; + if (p < first_frame() || p > last_frame()) { + continue; + } + result.push_back (p); + } } void @@ -1760,4 +1878,3 @@ Region::latest_possible_frame () const return _position + (minlen - _start) - 1; } -