diff options
Diffstat (limited to 'libs/ardour/region.cc')
| -rw-r--r-- | libs/ardour/region.cc | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc index 7c064cd0fe..17698d88a7 100644 --- a/libs/ardour/region.cc +++ b/libs/ardour/region.cc @@ -47,7 +47,7 @@ using namespace std; using namespace ARDOUR; using namespace PBD; -namespace ARDOUR { +namespace ARDOUR { namespace Properties { PBD::PropertyDescriptor<bool> muted; PBD::PropertyDescriptor<bool> opaque; @@ -74,7 +74,7 @@ namespace ARDOUR { PBD::PropertyDescriptor<PositionLockStyle> position_lock_style; } } - + PBD::Signal2<void,boost::shared_ptr<ARDOUR::Region>,const PropertyChange&> Region::RegionPropertyChanged; void @@ -280,14 +280,14 @@ Region::Region (boost::shared_ptr<const Region> other) /* 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 _start and _sync_pos was in the other region. - + result is that our new sync pos points to the same point in our source(s) as the sync in the other region did in its source(s). - + since we start at zero in our source(s), it is not possible to use a sync point that is before the start. reset it to _start if that was true in the other region. */ - + if (other->sync_marked()) { if (other->_start < other->_sync_position) { /* sync pos was after the start point of the other region */ @@ -346,12 +346,12 @@ Region::Region (boost::shared_ptr<const Region> other, frameoffset_t offset) use_sources (other->_sources); _start = other->_start + offset; - + /* if the other region had a distinct sync point set, then continue to use it as best we can. otherwise, reset sync point back to start. */ - + if (other->sync_marked()) { if (other->_sync_position < _start) { _sync_marked = false; @@ -551,19 +551,19 @@ Region::set_position_lock_style (PositionLockStyle ps) if (_position_lock_style != ps) { boost::shared_ptr<Playlist> pl (playlist()); - + if (!pl) { return; } - + _position_lock_style = ps; - + if (_position_lock_style == MusicTime) { _session.tempo_map().bbt_time (_position, _bbt_time); } send_change (Properties::position_lock_style); - + } } @@ -599,7 +599,7 @@ Region::set_position (framepos_t pos) a GUI that has moved its representation already. */ send_change (Properties::position); - + } void @@ -754,7 +754,7 @@ Region::trim_start (framepos_t new_position) } else { new_start = _start + start_shift; } - + } else { return; } @@ -805,7 +805,7 @@ 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; @@ -813,7 +813,7 @@ Region::modify_front (framepos_t new_position, bool reset_fade) /* can't trim it back past where source position zero is located */ new_position = max (new_position, source_zero); } - + if (new_position > _position) { newlen = _length - (new_position - _position); delta = -1 * (new_position - _position); @@ -821,17 +821,17 @@ Region::modify_front (framepos_t new_position, bool reset_fade) newlen = _length + (_position - new_position); delta = _position - new_position; } - + trim_to_internal (new_position, newlen); - + if (reset_fade) { _right_of_split = true; } - + if (!property_changes_suspended()) { recompute_at_start (); } - + if (_transients.size() > 0){ adjust_transients(delta); } @@ -930,7 +930,7 @@ Region::trim_to_internal (framepos_t position, framecnt_t length) * length in beats from (1) but at the new position, which is wrong if the region * straddles a tempo/meter change. */ - + if (_position != position) { if (!property_changes_suspended()) { _last_position = _position; @@ -938,7 +938,7 @@ Region::trim_to_internal (framepos_t position, framecnt_t length) set_position_internal (position, true); what_changed.add (Properties::position); } - + if (_length != length) { if (!property_changes_suspended()) { _last_length = _length; @@ -1208,14 +1208,14 @@ Region::state () } if (max_source_level() > 0) { - + XMLNode* nested_node = new XMLNode (X_("NestedSource")); - + /* region is compound - get its playlist and store that before we list the region that needs it ... */ - + for (SourceList::const_iterator s = _sources.begin(); s != _sources.end(); ++s) { nested_node->add_child_nocopy ((*s)->get_state ()); } @@ -1287,7 +1287,7 @@ Region::_set_state (const XMLNode& node, int /*version*/, PropertyChange& what_c if (_stretch == 0.0f) { _stretch = 1.0f; } - + if (_shift == 0.0f) { _shift = 1.0f; } @@ -1295,14 +1295,14 @@ Region::_set_state (const XMLNode& node, int /*version*/, PropertyChange& what_c if (send) { send_change (what_changed); } - + /* Quick fix for 2.x sessions when region is muted */ if ((prop = node.property (X_("flags")))) { if (string::npos != prop->value().find("Muted")){ set_muted (true); } } - + return 0; } @@ -1336,7 +1336,7 @@ Region::send_change (const PropertyChange& what_changed) Stateful::send_change (what_changed); if (!Stateful::frozen()) { - + /* Try and send a shared_pointer unless this is part of the constructor. If so, do nothing. */ @@ -1434,7 +1434,7 @@ Region::source_equivalent (boost::shared_ptr<const Region> other) const { if (!other) return false; - + if ((_sources.size() != other->_sources.size()) || (_master_sources.size() != other->_master_sources.size())) { return false; @@ -1465,7 +1465,7 @@ Region::source_string () const stringstream res; res << _sources.size() << ":"; - + SourceList::const_iterator i; for (i = _sources.begin(); i != _sources.end(); ++i) { @@ -1606,7 +1606,7 @@ Region::invalidate_transients () { _valid_transients = false; _transients.clear (); - + send_change (PropertyChange (Properties::valid_transients)); } @@ -1657,7 +1657,7 @@ Region::can_trim () const return ct; } - /* if not locked, we can always move the front later, and the end earlier + /* if not locked, we can always move the front later, and the end earlier */ ct = CanTrim (ct | FrontTrimLater | EndTrimEarlier); @@ -1674,7 +1674,7 @@ Region::can_trim () const return ct; } - + uint32_t Region::max_source_level () const { |