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

manual fixups after rebase against master

Browse Source
This commit is contained in:
Paul Davis 2020-12-06 16:33:17 -07:00
parent fe218e7478
commit c76c61d202
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/ardour/lv2_plugin.cc
View File

@ -2657,7 +2657,6 @@ LV2Plugin::connect_and_run(BufferSet& bufs,
if (_bpm_control_port) {
float bpm = tmap.tempo_at_sample (start0).note_types_per_minute();
TempoMapPoints tempo_map_points;
tmap->get_grid (tempo_map_points, start0, end, 0);
TempoMapPoint first_tempo_map_point = tempo_map_points.front();
@ -2747,11 +2746,8 @@ LV2Plugin::connect_and_run(BufferSet& bufs,
if (valid && (flags & PORT_INPUT)) {
if ((flags & PORT_POSITION)) {
const Temporal::TempoMetric& metric (tmap.metric_at (start0));
Temporal::BBT_Time bbt (metric.bbt_at (start0));
Temporal::BBT_Time bbt (first_tempo_map_point.bbt());
double bpm = first_tempo_map_point.tempo().note_types_per_minute();
double time_scale = Port::speed_ratio ();
double beatpos = (bbt.bars - 1) * first_tempo_map_point.divisions_per_bar()
+ (bbt.beats - 1)

2
libs/ardour/plugin_insert.cc
View File

@ -310,7 +310,7 @@ PluginInsert::control_list_automation_state_changed (Evoral::Parameter which, Au
= boost::dynamic_pointer_cast<AutomationControl>(control (which));
if (c && s != Off) {
_plugins[0]->set_parameter (which.id(), c->list()->eval (timepos_t (_session.transport_sample())), 0)
_plugins[0]->set_parameter (which.id(), c->list()->eval (timepos_t (_session.transport_sample())), 0);
}
}