X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fregion.cc;h=ca2914764a91dd468c1ba69242d24692b86579f5;hb=e7a154b9dd8ed43a77424f8624ce61db0fa390d9;hp=1784cdbf3c1acac7cf3a64ec1299aefa4af40e77;hpb=5399425f534e2d96d07cf29f427bfa0f39d904b7;p=ardour.git diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc index 1784cdbf3c..ca2914764a 100644 --- a/libs/ardour/region.cc +++ b/libs/ardour/region.cc @@ -36,8 +36,9 @@ #include "ardour/session.h" #include "ardour/source.h" #include "ardour/tempo.h" +#include "ardour/transient_detector.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; @@ -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,17 +273,19 @@ 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; use_sources (other->_sources); + set_master_sources (other->_master_sources); _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 @@ -301,17 +312,6 @@ Region::Region (boost::shared_ptr other) _sync_position = _start; } - if (Profile->get_sae()) { - /* reset sync point to start if its ended up - outside region bounds. - */ - - if (_sync_position < _start || _sync_position >= _start + _length) { - _sync_marked = false; - _sync_position = _start; - } - } - assert (_type == other->data_type()); } @@ -320,13 +320,14 @@ Region::Region (boost::shared_ptr other) the start within \a other is given by \a offset (i.e. relative to the start of \a other's sources, the start is \a offset + \a other.start() */ -Region::Region (boost::shared_ptr other, frameoffset_t offset) +Region::Region (boost::shared_ptr other, frameoffset_t offset, const int32_t sub_num) : SessionObject(other->session(), other->name()) , _type (other->data_type()) , REGION_COPY_STATE (other) , _last_length (other->_last_length) , _last_position(other->_last_position) \ , _first_edit (EditChangesNothing) + , _beat (0.0) , _layer (other->_layer) { register_properties (); @@ -334,14 +335,16 @@ 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; use_sources (other->_sources); + set_master_sources (other->_master_sources); _start = other->_start + offset; + _beat = _session.tempo_map().exact_beat_at_frame (_position, sub_num); /* if the other region had a distinct sync point set, then continue to use it as best we can. @@ -360,17 +363,6 @@ Region::Region (boost::shared_ptr other, frameoffset_t offset) _sync_position = _start; } - if (Profile->get_sae()) { - /* reset sync point to start if its ended up - outside region bounds. - */ - - if (_sync_position < _start || _sync_position >= _start + _length) { - _sync_marked = false; - _sync_position = _start; - } - } - assert (_type == other->data_type()); } @@ -427,7 +419,7 @@ Region::set_name (const std::string& str) } void -Region::set_length (framecnt_t len) +Region::set_length (framecnt_t len, const int32_t sub_num) { //cerr << "Region::set_length() len = " << len << endl; if (locked()) { @@ -449,12 +441,11 @@ Region::set_length (framecnt_t len) } - _last_length = _length; - set_length_internal (len); + set_length_internal (len, sub_num); _whole_file = false; first_edit (); maybe_uncopy (); - invalidate_transients (); + maybe_invalidate_transients (); if (!property_changes_suspended()) { recompute_at_end (); @@ -465,8 +456,9 @@ Region::set_length (framecnt_t len) } void -Region::set_length_internal (framecnt_t len) +Region::set_length_internal (framecnt_t len, const int32_t sub_num) { + _last_length = _length; _length = len; } @@ -549,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); @@ -557,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()); @@ -565,41 +557,65 @@ Region::update_after_tempo_map_change () return; } - TempoMap& map (_session.tempo_map()); - framepos_t pos = map.frame_time (_bbt_time); - set_position_internal (pos, false); + const framepos_t pos = _session.tempo_map().frame_at_beat (_beat); + /* we have _beat. update frame position non-musically */ + set_position_internal (pos, false, 0); /* 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 -Region::set_position (framepos_t pos) +Region::set_position (framepos_t pos, int32_t sub_num) { if (!can_move()) { return; } - set_position_internal (pos, true); + if (sub_num == 0) { + set_position_internal (pos, true, 0); + } else { + double beat = _session.tempo_map().exact_beat_at_frame (pos, sub_num); + _beat = beat; + set_position_internal (pos, false, sub_num); + } /* 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); } +/** A gui may need to create a region, then place it in an initial + * position determined by the user. + * When this takes place within one gui operation, we have to reset + * _last_position to prevent an implied move. + */ void -Region::set_position_internal (framepos_t pos, bool allow_bbt_recompute) +Region::set_initial_position (framepos_t pos) { - /* We emit a change of Properties::position even if the position hasn't changed - (see Region::set_position), so we must always set this up so that - e.g. Playlist::notify_region_moved doesn't use an out-of-date last_position. - */ - _last_position = _position; - + if (!can_move()) { + return; + } + if (_position != pos) { _position = pos; @@ -614,20 +630,49 @@ Region::set_position_internal (framepos_t pos, bool allow_bbt_recompute) _length = max_framepos - _position; } + recompute_position_from_lock_style (0); + /* ensure that this move doesn't cause a range move */ + _last_position = _position; + } + + + /* do this even if the position is the same. this helps out + a GUI that has moved its representation already. + */ + send_change (Properties::position); +} + +void +Region::set_position_internal (framepos_t pos, bool allow_bbt_recompute, const int32_t sub_num) +{ + /* We emit a change of Properties::position even if the position hasn't changed + (see Region::set_position), so we must always set this up so that + e.g. Playlist::notify_region_moved doesn't use an out-of-date last_position. + */ + _last_position = _position; + + if (_position != pos) { + _position = pos; + if (allow_bbt_recompute) { - recompute_position_from_lock_style (); + recompute_position_from_lock_style (sub_num); } + /* check that the new _position wouldn't make the current + length impossible - if so, change the length. - //invalidate_transients (); + XXX is this the right thing to do? + */ + if (max_framepos - _length < _position) { + _last_length = _length; + _length = max_framepos - _position; + } } } void -Region::recompute_position_from_lock_style () +Region::recompute_position_from_lock_style (const int32_t sub_num) { - if (_position_lock_style == MusicTime) { - _session.bbt_time (_position, _bbt_time); - } + _beat = _session.tempo_map().exact_beat_at_frame (_position, sub_num); } void @@ -656,8 +701,8 @@ Region::nudge_position (frameoffset_t n) new_position += n; } } - - set_position_internal (new_position, true); + /* assumes non-musical nudge */ + set_position_internal (new_position, true, 0); send_change (Properties::position); } @@ -691,14 +736,14 @@ Region::set_start (framepos_t pos) set_start_internal (pos); _whole_file = false; first_edit (); - invalidate_transients (); + maybe_invalidate_transients (); send_change (Properties::start); } } void -Region::move_start (frameoffset_t distance) +Region::move_start (frameoffset_t distance, const int32_t sub_num) { if (locked() || position_locked() || video_locked()) { return; @@ -734,7 +779,7 @@ Region::move_start (frameoffset_t distance) return; } - set_start_internal (new_start); + set_start_internal (new_start, sub_num); _whole_file = false; first_edit (); @@ -743,25 +788,25 @@ Region::move_start (frameoffset_t distance) } void -Region::trim_front (framepos_t new_position) +Region::trim_front (framepos_t new_position, const int32_t sub_num) { - modify_front (new_position, false); + modify_front (new_position, false, sub_num); } void -Region::cut_front (framepos_t new_position) +Region::cut_front (framepos_t new_position, const int32_t sub_num) { - modify_front (new_position, true); + modify_front (new_position, true, sub_num); } void -Region::cut_end (framepos_t new_endpoint) +Region::cut_end (framepos_t new_endpoint, const int32_t sub_num) { - modify_end (new_endpoint, true); + modify_end (new_endpoint, true, sub_num); } void -Region::modify_front (framepos_t new_position, bool reset_fade) +Region::modify_front (framepos_t new_position, bool reset_fade, const int32_t sub_num) { if (locked()) { return; @@ -779,7 +824,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 */ @@ -788,13 +832,11 @@ 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); + trim_to_internal (new_position, newlen, sub_num); if (reset_fade) { _right_of_split = true; @@ -804,21 +846,19 @@ Region::modify_front (framepos_t new_position, bool reset_fade) recompute_at_start (); } - if (_transients.size() > 0){ - adjust_transients(delta); - } + maybe_invalidate_transients (); } } void -Region::modify_end (framepos_t new_endpoint, bool reset_fade) +Region::modify_end (framepos_t new_endpoint, bool reset_fade, const int32_t sub_num) { if (locked()) { return; } if (new_endpoint > _position) { - trim_to_internal (_position, new_endpoint - _position); + trim_to_internal (_position, new_endpoint - _position, sub_num); if (reset_fade) { _left_of_split = true; } @@ -833,19 +873,19 @@ Region::modify_end (framepos_t new_endpoint, bool reset_fade) */ void -Region::trim_end (framepos_t new_endpoint) +Region::trim_end (framepos_t new_endpoint, const int32_t sub_num) { - modify_end (new_endpoint, false); + modify_end (new_endpoint, false, sub_num); } void -Region::trim_to (framepos_t position, framecnt_t length) +Region::trim_to (framepos_t position, framecnt_t length, const int32_t sub_num) { if (locked()) { return; } - trim_to_internal (position, length); + trim_to_internal (position, length, sub_num); if (!property_changes_suspended()) { recompute_at_start (); @@ -854,7 +894,7 @@ Region::trim_to (framepos_t position, framecnt_t length) } void -Region::trim_to_internal (framepos_t position, framecnt_t length) +Region::trim_to_internal (framepos_t position, framecnt_t length, const int32_t sub_num) { framepos_t new_start; @@ -891,10 +931,11 @@ Region::trim_to_internal (framepos_t position, framecnt_t length) PropertyChange what_changed; if (_start != new_start) { - set_start_internal (new_start); + set_start_internal (new_start, sub_num); 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 @@ -907,7 +948,7 @@ Region::trim_to_internal (framepos_t position, framecnt_t length) if (!property_changes_suspended()) { _last_position = _position; } - set_position_internal (position, true); + set_position_internal (position, true, sub_num); what_changed.add (Properties::position); } @@ -915,7 +956,7 @@ Region::trim_to_internal (framepos_t position, framecnt_t length) if (!property_changes_suspended()) { _last_length = _length; } - set_length_internal (length); + set_length_internal (length, sub_num); what_changed.add (Properties::length); } @@ -1138,7 +1179,7 @@ Region::state () XMLNode *node = new XMLNode ("Region"); char buf[64]; char buf2[64]; - LocaleGuard lg (X_("POSIX")); + LocaleGuard lg; const char* fe = NULL; /* custom version of 'add_properties (*node);' @@ -1178,9 +1219,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) { @@ -1240,7 +1280,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); @@ -1250,14 +1291,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); } } } @@ -1284,6 +1334,10 @@ Region::_set_state (const XMLNode& node, int /*version*/, PropertyChange& what_c } } + // saved property is invalid, region-transients are not saved + if (_user_transients.size() == 0){ + _valid_transients = false; + } return 0; } @@ -1473,19 +1527,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; + } } } } @@ -1495,11 +1589,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; + } } } } @@ -1507,6 +1603,7 @@ Region::uses_source (boost::shared_ptr source) const return false; } + framecnt_t Region::source_length(uint32_t n) const { @@ -1515,7 +1612,7 @@ Region::source_length(uint32_t n) const } bool -Region::verify_length (framecnt_t len) +Region::verify_length (framecnt_t& len) { if (source() && (source()->destructive() || source()->length_mutable())) { return true; @@ -1605,12 +1702,60 @@ Region::apply (Filter& filter, Progress* progress) void -Region::invalidate_transients () +Region::maybe_invalidate_transients () +{ + bool changed = !_onsets.empty(); + _onsets.clear (); + + if (_valid_transients || changed) { + send_change (PropertyChange (Properties::valid_transients)); + return; + } +} + +void +Region::transients (AnalysisFeatureList& afl) { - _valid_transients = false; - _transients.clear (); + int cnt = afl.empty() ? 0 : 1; - send_change (PropertyChange (Properties::valid_transients)); + 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 @@ -1700,12 +1845,12 @@ void Region::post_set (const PropertyChange& pc) { if (pc.contains (Properties::position)) { - recompute_position_from_lock_style (); + recompute_position_from_lock_style (0); } } void -Region::set_start_internal (framecnt_t s) +Region::set_start_internal (framecnt_t s, const int32_t sub_num) { _start = s; } @@ -1738,4 +1883,3 @@ Region::latest_possible_frame () const return _position + (minlen - _start) - 1; } -