allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

triggerbox: try to get tempo from segment descriptor, and add Meter member var

Browse Source
This commit is contained in:
Paul Davis
2022-01-13 15:48:44 -07:00
parent 1994935550
commit 2570b43ab6
2 changed files with 77 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/ardour/ardour/triggerbox.h
View File

@@ -263,6 +263,9 @@ class LIBARDOUR_API Trigger : public PBD::Stateful {
double apparent_tempo() const { return _apparent_tempo; }
double set_tempo (double t);
Temporal::Meter meter() const { return _meter; }
void set_tempo (Temporal::Meter const &);
void set_pending (Trigger*);
Trigger* swap_pending (Trigger*);
@@ -318,6 +321,7 @@ class LIBARDOUR_API Trigger : public PBD::Stateful {
double _barcnt; /* our estimate of the number of bars in the region */
double _apparent_tempo;
Temporal::Meter _meter;
samplepos_t expected_end_sample;
Temporal::BBT_Offset _start_quantization;
std::atomic<Trigger*> _pending;

132
libs/ardour/triggerbox.cc
View File

@@ -99,6 +99,7 @@ Trigger::Trigger (uint32_t n, TriggerBox& b)
, cue_launched (false)
, _barcnt (0.)
, _apparent_tempo (0.)
, _meter (4, 4)
, expected_end_sample (0)
, _pending ((Trigger*) 0)
{
@@ -1069,79 +1070,92 @@ void
AudioTrigger::determine_tempo ()
{
using namespace Temporal;
/* check the name to see if there's a (heuristically obvious) hint
* about the tempo.
*/
string str = _region->name();
string::size_type bi;
string::size_type ni;
double text_tempo = -1.;
std::cerr << "Determine tempo for " << name() << std::endl;
if (((bi = str.find ("bpm")) != string::npos) ||
((bi = str.find ("BPM")) != string::npos)) {
string sub (str.substr (0, bi));
if ((ni = sub.find_last_of ("0123456789.,_-")) != string::npos) {
int nni = ni; /* ni is unsigned, nni is signed */
while (nni >= 0) {
if (!isdigit (sub[nni]) &&
(sub[nni] != '.') &&
(sub[nni] != ',')) {
break;
}
--nni;
}
if (nni > 0) {
std::stringstream p (sub.substr (nni + 1));
p >> text_tempo;
if (!p) {
text_tempo = -1.;
} else {
_apparent_tempo = text_tempo;
std::cerr << "from filename, tempo = " << _apparent_tempo << std::endl;
}
}
}
}
TempoMap::SharedPtr tm (TempoMap::use());
/* We don't have too many good choices here. Triggers can fire at any
* time, so there's no special place on the tempo map that we can use
* to get the meter from and thus compute an apparent bar count for
* this region. Our solution for now: just use the first meter.
*/
TimelineRange range (_region->start(), _region->start() + _region->length(), 0);
SegmentDescriptor* segment = _region->source (0)->get_segment_descriptor (range);
TempoMetric const & metric (tm->metric_at (timepos_t (AudioTime)));
if (segment) {
if (text_tempo < 0) {
_apparent_tempo = segment->tempo().quarter_notes_per_minute ();
_meter = segment->meter();
breakfastquay::MiniBPM mbpm (_box.session().sample_rate());
} else {
/* not a great guess, but what else can we do? */
mbpm.setBPMRange (metric.tempo().quarter_notes_per_minute () * 0.75, metric.tempo().quarter_notes_per_minute() * 1.5);
TempoMetric const & metric (tm->metric_at (timepos_t (AudioTime)));
_apparent_tempo = mbpm.estimateTempoOfSamples (data[0], data.length);
_meter = metric.meter ();
if (_apparent_tempo == 0.0) {
/* no apparent tempo, just return since we'll use it as-is */
std::cerr << "Could not determine tempo for " << name() << std::endl;
return;
/* check the name to see if there's a (heuristically obvious) hint
* about the tempo.
*/
string str = _region->name();
string::size_type bi;
string::size_type ni;
double text_tempo = -1.;
std::cerr << "Determine tempo for " << name() << std::endl;
if (((bi = str.find ("bpm")) != string::npos) ||
((bi = str.find ("BPM")) != string::npos)) {
string sub (str.substr (0, bi));
if ((ni = sub.find_last_of ("0123456789.,_-")) != string::npos) {
int nni = ni; /* ni is unsigned, nni is signed */
while (nni >= 0) {
if (!isdigit (sub[nni]) &&
(sub[nni] != '.') &&
(sub[nni] != ',')) {
break;
}
--nni;
}
if (nni > 0) {
std::stringstream p (sub.substr (nni + 1));
p >> text_tempo;
if (!p) {
text_tempo = -1.;
} else {
_apparent_tempo = text_tempo;
std::cerr << "from filename, tempo = " << _apparent_tempo << std::endl;
}
}
}
}
cerr << name() << " Estimated bpm " << _apparent_tempo << " from " << (double) data.length / _box.session().sample_rate() << " seconds\n";
/* We don't have too many good choices here. Triggers can fire at any
* time, so there's no special place on the tempo map that we can use
* to get the meter from and thus compute an apparent bar count for
* this region. Our solution for now: just use the first meter.
*/
if (text_tempo < 0) {
breakfastquay::MiniBPM mbpm (_box.session().sample_rate());
mbpm.setBPMRange (metric.tempo().quarter_notes_per_minute () * 0.75, metric.tempo().quarter_notes_per_minute() * 1.5);
_apparent_tempo = mbpm.estimateTempoOfSamples (data[0], data.length);
if (_apparent_tempo == 0.0) {
/* no apparent tempo, just return since we'll use it as-is */
std::cerr << "Could not determine tempo for " << name() << std::endl;
return;
}
cerr << name() << " Estimated bpm " << _apparent_tempo << " from " << (double) data.length / _box.session().sample_rate() << " seconds\n";
}
}
const double seconds = (double) data.length / _box.session().sample_rate();
const double quarters = (seconds / 60.) * _apparent_tempo;
_barcnt = quarters / metric.meter().divisions_per_bar();
_barcnt = quarters / _meter.divisions_per_bar();
/* now check the determined tempo and force it to a value that gives us
an integer bar/quarter count. This is a heuristic that tries to