ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Fix Region lock style property (#9191)

Browse Source 
This allows to properly toggle "Glue to Bars/Beats".

Editor::toggle_region_lock_style uses Region::position_time_domain(),
However Region::set_position_time_domain() checked the duration's
time-domain.

Furthermore timecnt_t::set_time_domain() changes both the
position and the duration's time domain. This can lead to
various issues. We only need to change the time-domain of
the timepos_t _position.
This commit is contained in:
Robin Gareus 2023-01-10 20:02:23 +01:00
parent 9d46bbab7b
commit f658a4c0b2
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
libs/ardour/region.cc
View File

@ -583,19 +583,36 @@ Region::special_set_position (timepos_t const & pos)
void
Region::set_position_time_domain (Temporal::TimeDomain td)
{
if (_length.val().time_domain() != td) {
/* _length is a property so we cannot directly call
* ::set_time_domain() on it. Create a temporary timecnt_t,
* change it's time domain, and then assign to _length
*/
timecnt_t t (_length.val());
t.set_time_domain (td);
_length = t;
send_change (Properties::time_domain);
if (position_time_domain() == td) {
return;
}
/* _length is a property so we cannot directly call
* ::set_time_domain() on it. Create a temporary timecnt_t,
* change it's time domain, and then assign to _length.
*
* The region's duration (distance) time-domain must not change (!)
*
* An Audio region's duration must always be given in samples,
* and a MIDI region's duration in beats.
* (Beat granularity is coarser than samples. If an Audio-region's duration
* is specified in beats, the disk-reader can try to read more samples than
* are present in the source. This causes various follow up bugs.
*
* This can change in the future:
* - When events inside a MIDI region can use Audio-time, a MIDI region's duration must also be specified in in audio-time.
* - When Ardour support time-strech of Audio regions at disk-reader level, Audio regions can be stretched to match music-time.
*/
timepos_t p (position ());
p.set_time_domain (td);
timecnt_t t (length ().distance (), p);
_length = t;
/* ensure time-domain matches Datatype -- this may trigger in old broken sessions */
assert (_length.val().time_domain () == time_domain ());
send_change (Properties::time_domain);
}
void
@ -619,7 +636,7 @@ Region::update_after_tempo_map_change (bool send)
* change
*/
if (_length.val().time_domain() == Temporal::AudioTime) {
if (_length.val().time_domain() == Temporal::AudioTime && position_time_domain () == Temporal::AudioTime) {
return;
}