diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-03-19 23:44:40 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-05-27 23:38:11 +1000 |
| commit | b415b59f790f049a73464efc7fdf0f2858e1bde8 (patch) | |
| tree | bfe28234131383e4b2a7417410134ca21e59086c /gtk2_ardour/tempo_dialog.cc | |
| parent | a47359c38280398acc80494cdc72ce129ae0edc3 (diff) | |
Tempo ramps - respect tempo note type and meter note divisor correctly.
- tempo and meter position is now pulse-based,
although meter still has a beat for convenience.
Diffstat (limited to 'gtk2_ardour/tempo_dialog.cc')
| -rw-r--r-- | gtk2_ardour/tempo_dialog.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/tempo_dialog.cc b/gtk2_ardour/tempo_dialog.cc index 0d982a4085..0cd616a1ff 100644 --- a/gtk2_ardour/tempo_dialog.cc +++ b/gtk2_ardour/tempo_dialog.cc @@ -64,7 +64,7 @@ TempoDialog::TempoDialog (TempoMap& map, TempoSection& section, const string&) , tap_tempo_button (_("Tap tempo")) { Timecode::BBT_Time when; - map.bbt_time (map.frame_at_beat (section.beat()), when); + map.bbt_time (section.frame(), when); init (when, section.beats_per_minute(), section.note_type(), section.type(), section.movable(), section.position_lock_style()); } @@ -425,7 +425,7 @@ MeterDialog::MeterDialog (TempoMap& map, MeterSection& section, const string&) : ArdourDialog (_("Edit Meter")) { Timecode::BBT_Time when; - map.bbt_time (map.frame_at_beat (section.beat()), when); + map.bbt_time (section.frame(), when); init (when, section.divisions_per_bar(), section.note_divisor(), section.movable(), section.position_lock_style()); } |