smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 23:35:03 +01:00
Code Issues Projects Releases Wiki Activity

Region always sets position before length.

Browse source
This commit is contained in:
nick_m 2016-06-07 02:12:04 +10:00
parent 20d85384c1
commit 92fdf7deda
1 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
libs/ardour/region.cc
View file

@ -326,6 +326,7 @@ Region::Region (boost::shared_ptr<const Region> other, frameoffset_t offset)
, _last_length (other->_last_length) , _last_length (other->_last_length)
, _last_position(other->_last_position) \ , _last_position(other->_last_position) \
, _first_edit (EditChangesNothing) , _first_edit (EditChangesNothing)
, _beat (0.0)
, _layer (other->_layer) , _layer (other->_layer)
{ {
register_properties (); register_properties ();
@ -333,7 +334,7 @@ Region::Region (boost::shared_ptr<const Region> other, frameoffset_t offset)
/* override state that may have been incorrectly inherited from the other region /* override state that may have been incorrectly inherited from the other region
*/ */
_position = 0; _position = other->_position + offset;
_locked = false; _locked = false;
_whole_file = false; _whole_file = false;
_hidden = false; _hidden = false;
@ -644,20 +645,18 @@ Region::set_position_internal (framepos_t pos, bool allow_bbt_recompute)
if (_position != pos) { if (_position != pos) {
_position = pos; _position = pos;
if (allow_bbt_recompute) {
recompute_position_from_lock_style ();
}
/* check that the new _position wouldn't make the current /* check that the new _position wouldn't make the current
length impossible - if so, change the length. length impossible - if so, change the length.
XXX is this the right thing to do? XXX is this the right thing to do?
*/ */
if (max_framepos - _length < _position) { if (max_framepos - _length < _position) {
_last_length = _length; _last_length = _length;
_length = max_framepos - _position; _length = max_framepos - _position;
} }
if (allow_bbt_recompute) {
recompute_position_from_lock_style ();
}
} }
} }
@ -924,11 +923,6 @@ Region::trim_to_internal (framepos_t position, framecnt_t length)
PropertyChange what_changed; PropertyChange what_changed;
if (_start != new_start) {
set_start_internal (new_start);
what_changed.add (Properties::start);
}
/* Set position before length, otherwise for MIDI regions this bad thing happens: /* 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 * 1. we call set_length_internal; length in beats is computed using the region's current
* (soon-to-be old) position * (soon-to-be old) position
@ -945,6 +939,11 @@ Region::trim_to_internal (framepos_t position, framecnt_t length)
what_changed.add (Properties::position); what_changed.add (Properties::position);
} }
if (_start != new_start) {
set_start_internal (new_start);
what_changed.add (Properties::start);
}
if (_length != length) { if (_length != length) {
if (!property_changes_suspended()) { if (!property_changes_suspended()) {
_last_length = _length; _last_length = _length;