Robin Gareus
14da117bc8
This fixes various rounding issues. Notably superclock to sample conversion must always round down when playing forward. `::process (start, end, speed = 1)` uses exclusive end. Processing begins at `start` and end ends just before `end`. Next cycle will begin with the current end. One example where this failed: - New session at 48kHz - Change tempo to 130 BPM - Enable snap to 1/8 note - Snap playhead to 1|3|0 - Enable Metronome - Play `assert (superclock_to_samples ((*i).sclock(), sample_rate()) < end);` end = 177231 samples == superclock 1042118280 A grid point is found at superclock 1042116920 (that is < 1042118280). However converting it back to samples rounded it to sample 177231 == end, while actual location is 1360 super-clock ticks before end. The metronome click has to be started this cycle, since the same position will not be found at the beginning of the next cycle, with start = 177232. Similarly a samplecnt_t t, converted to music-time and back must not be later than the given sample. ``` timepos_t tsc (t); assert (timepos_t::from_ticks (tsc.ticks ()).samples () <= t); ``` IOW. When playing forward, all super-clock time between 1|1|0 and 1|1|1 should round down to 1|1|0. "We have not yet reached the first tick".
63 lines
2.1 KiB
C++
63 lines
2.1 KiB
C++
/*
|
|
* Copyright (C) 2017 Paul Davis <paul@linuxaudiosystems.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
#ifndef __ardour_superclock_h__
|
|
#define __ardour_superclock_h__
|
|
|
|
#include <stdint.h>
|
|
|
|
#include "pbd/integer_division.h"
|
|
|
|
#include "temporal/visibility.h"
|
|
|
|
namespace Temporal {
|
|
|
|
typedef int64_t superclock_t;
|
|
|
|
#ifndef COMPILER_MSVC
|
|
extern superclock_t _superclock_ticks_per_second;
|
|
#else
|
|
static superclock_t _superclock_ticks_per_second = 282240000; /* 2^10 * 3^2 * 5^4 * 7^2 */
|
|
#endif
|
|
|
|
extern bool scts_set;
|
|
|
|
#ifdef DEBUG_EARLY_SCTS_USE
|
|
|
|
#include <cstdlib>
|
|
#include <csignal>
|
|
|
|
static inline superclock_t superclock_ticks_per_second() { if (!scts_set) { raise (SIGUSR2); } return _superclock_ticks_per_second; }
|
|
#else
|
|
static inline superclock_t superclock_ticks_per_second() { return _superclock_ticks_per_second; }
|
|
#endif
|
|
|
|
static inline superclock_t superclock_to_samples (superclock_t s, int sr) { return PBD::muldiv_floor (s, sr, superclock_ticks_per_second()); }
|
|
static inline superclock_t samples_to_superclock (int64_t samples, int sr) { return PBD::muldiv_round (samples, superclock_ticks_per_second(), superclock_t (sr)); }
|
|
|
|
LIBTEMPORAL_API extern int most_recent_engine_sample_rate;
|
|
|
|
LIBTEMPORAL_API void set_sample_rate (int sr);
|
|
LIBTEMPORAL_API void set_superclock_ticks_per_second (superclock_t sc);
|
|
|
|
}
|
|
|
|
#define TEMPORAL_SAMPLE_RATE (Temporal::most_recent_engine_sample_rate)
|
|
|
|
#endif /* __ardour_superclock_h__ */
|