ardour/livetrax
13
0
Fork 0
Code

locations: ensure they follow session time when start/end is set

Browse Source
This commit is contained in:
Paul Davis 2023-07-21 17:10:58 -06:00
parent d14a3b924e
commit 71953a9929
1 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
libs/ardour/location.cc
View File

@ -105,8 +105,6 @@ Location::set_position_time_domain (TimeDomain domain)
emit_signal (Domain); /* EMIT SIGNAL */
}
Location::Location (const Location& other)
: SessionHandleRef (other._session)
, StatefulDestructible()
@ -268,13 +266,20 @@ Location::set_name (const std::string& str)
* @param force true to force setting, even if the given new start is after the current end.
*/
int
Location::set_start (Temporal::timepos_t const & s, bool force)
Location::set_start (Temporal::timepos_t const & s_, bool force)
{
if (_locked) {
return -1;
}
timepos_t s;
if (_session.time_domain() == Temporal::AudioTime) {
s = timepos_t (s_.samples());
} else {
s = timepos_t (s_.beats());
}
if (!force) {
if (((is_auto_punch() || is_auto_loop()) && s >= _end) || (!is_mark() && s > _end)) {
return -1;
@ -333,12 +338,20 @@ Location::set_start (Temporal::timepos_t const & s, bool force)
* @param force true to force setting, even if the given new end is before the current start.
*/
int
Location::set_end (Temporal::timepos_t const & e, bool force)
Location::set_end (Temporal::timepos_t const & e_, bool force)
{
if (_locked) {
return -1;
}
timepos_t e;
if (_session.time_domain() == Temporal::AudioTime) {
e = timepos_t (e_.samples());
} else {
e = timepos_t (e_.beats());
}
if (!force) {
if (((is_auto_punch() || is_auto_loop()) && e <= _start) || e < _start) {
return -1;
@ -381,16 +394,27 @@ Location::set_end (Temporal::timepos_t const & e, bool force)
}
int
Location::set (Temporal::timepos_t const & s, Temporal::timepos_t const & e)
Location::set (Temporal::timepos_t const & s_, Temporal::timepos_t const & e_)
{
/* check validity */
if (((is_auto_punch() || is_auto_loop()) && s >= e) || (!is_mark() && s > e)) {
if (((is_auto_punch() || is_auto_loop()) && s_ >= e_) || (!is_mark() && s_ > e_)) {
return -1;
}
bool start_change = false;
bool end_change = false;
timepos_t s;
timepos_t e;
if (_session.time_domain() == Temporal::AudioTime) {
s = timepos_t (s_.samples());
e = timepos_t (e_.samples());
} else {
s = timepos_t (s_.beats());
e = timepos_t (e_.beats());
}
if (is_mark()) {
if (_start != s) {
@ -1884,7 +1908,6 @@ Locations::globally_change_time_domain (Temporal::TimeDomain from, Temporal::Tim
void
Locations::change_time_domain (Temporal::TimeDomain from, Temporal::TimeDomain to)
{
std::cerr << "change all locations to " << to << std::endl;
Glib::Threads::RWLock::WriterLock lm (_lock);
for (auto & l : locations) {
l->change_time_domain (from, to);