diff options
| author | nick_m <mainsbridge@gmail.com> | 2017-07-18 02:48:04 +1000 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2017-07-22 02:15:20 +1000 |
| commit | 1399ef391de5b05888ea2e13e6ff80f14b6e84d9 (patch) | |
| tree | b9930edcee2fcfd0f427c6e58db67e41915913df /gtk2_ardour | |
| parent | c03da364ad31dc31e90f954e6d8f7e38a59bdcfd (diff) | |
Remove redundant beat arg from TempoMap::add_meter
BBT time should be enough to determine the beat.
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/editor_audio_import.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/editor_drag.cc | 5 | ||||
| -rw-r--r-- | gtk2_ardour/editor_tempodisplay.cc | 7 |
3 files changed, 6 insertions, 8 deletions
diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc index c217f05823..0ee0810ff2 100644 --- a/gtk2_ardour/editor_audio_import.cc +++ b/gtk2_ardour/editor_audio_import.cc @@ -293,7 +293,7 @@ Editor::import_smf_tempo_map (Evoral::SMF const & smf, framepos_t pos) new_map.add_tempo (tempo, (t->time_pulses/smf.ppqn()) / 4.0, 0, MusicTime); if (!(meter == last_meter)) { bbt = new_map.bbt_at_quarter_note ((t->time_pulses/smf.ppqn())); - new_map.add_meter (meter, t->time_pulses, bbt, 0, MusicTime); + new_map.add_meter (meter, bbt, 0, MusicTime); } } else { diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index e59e047f1c..be2cbbcf06 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -3308,10 +3308,9 @@ MeterMarkerDrag::motion (GdkEvent* event, bool first_move) } else { --bbt.bars; } - const double beat = map.beat_at_bbt (bbt); - const framepos_t frame = map.frame_at_beat (beat); + const framepos_t frame = map.frame_at_bbt (bbt); _real_section = map.add_meter (Meter (_marker->meter().divisions_per_bar(), _marker->meter().note_divisor()) - , beat, bbt, frame, _real_section->position_lock_style()); + , bbt, frame, _real_section->position_lock_style()); if (!_real_section) { aborted (true); return; diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index 35f74b6d54..b71ab32087 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -452,15 +452,14 @@ Editor::mouse_add_new_meter_event (framepos_t frame) Timecode::BBT_Time requested; meter_dialog.get_bbt_time (requested); - const double beat = map.beat_at_bbt (requested); - const double al_frame = map.frame_at_beat (beat); + const double al_frame = map.frame_at_bbt (requested); begin_reversible_command (_("add meter mark")); XMLNode &before = map.get_state(); if (meter_dialog.get_lock_style() == MusicTime) { - map.add_meter (Meter (bpb, note_type), beat, requested, 0, MusicTime); + map.add_meter (Meter (bpb, note_type), requested, 0, MusicTime); } else { - map.add_meter (Meter (bpb, note_type), beat, requested, al_frame, AudioTime); + map.add_meter (Meter (bpb, note_type), requested, al_frame, AudioTime); } _session->add_command(new MementoCommand<TempoMap>(map, &before, &map.get_state())); |