From 34e41a3ca6376d42fa1e3ada7f3373ddb43e2429 Mon Sep 17 00:00:00 2001 From: nick_m Date: Fri, 25 Nov 2016 01:38:19 +1100 Subject: rename MetricSection movable -> initial, but of course initial is !movable.. --- gtk2_ardour/tempo_dialog.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gtk2_ardour/tempo_dialog.cc') diff --git a/gtk2_ardour/tempo_dialog.cc b/gtk2_ardour/tempo_dialog.cc index c28dfaf219..0c13f99948 100644 --- a/gtk2_ardour/tempo_dialog.cc +++ b/gtk2_ardour/tempo_dialog.cc @@ -63,11 +63,11 @@ TempoDialog::TempoDialog (TempoMap& map, TempoSection& section, const string&) , tap_tempo_button (_("Tap tempo")) { Timecode::BBT_Time when (map.bbt_at_frame (section.frame())); - init (when, section.note_types_per_minute(), section.note_type(), section.type(), section.movable(), section.position_lock_style()); + init (when, section.note_types_per_minute(), section.note_type(), section.type(), section.initial(), section.position_lock_style()); } void -TempoDialog::init (const Timecode::BBT_Time& when, double bpm, double note_type, TempoSection::Type type, bool movable, PositionLockStyle style) +TempoDialog::init (const Timecode::BBT_Time& when, double bpm, double note_type, TempoSection::Type type, bool initial, PositionLockStyle style) { vector strings; NoteTypes::iterator x; @@ -177,7 +177,7 @@ TempoDialog::init (const Timecode::BBT_Time& when, double bpm, double note_type, snprintf (buf, sizeof (buf), "%" PRIu32, when.beats); when_beat_entry.set_text (buf); - if (movable) { + if (!initial) { when_bar_entry.set_width_chars(4); when_beat_entry.set_width_chars (4); when_bar_entry.set_alignment (1.0); @@ -430,11 +430,11 @@ MeterDialog::MeterDialog (TempoMap& map, MeterSection& section, const string&) { Timecode::BBT_Time when (map.bbt_at_frame (section.frame())); - init (when, section.divisions_per_bar(), section.note_divisor(), section.movable(), section.position_lock_style()); + init (when, section.divisions_per_bar(), section.note_divisor(), section.initial(), section.position_lock_style()); } void -MeterDialog::init (const Timecode::BBT_Time& when, double bpb, double divisor, bool movable, PositionLockStyle style) +MeterDialog::init (const Timecode::BBT_Time& when, double bpb, double divisor, bool initial, PositionLockStyle style) { char buf[64]; vector strings; @@ -510,7 +510,7 @@ MeterDialog::init (const Timecode::BBT_Time& when, double bpb, double divisor, b when_bar_entry.set_text (buf); when_bar_entry.set_alignment (1.0); - if (movable) { + if (!initial) { Label* when_label = manage (new Label(_("Meter begins at bar:"), ALIGN_LEFT, ALIGN_CENTER)); table->attach (*when_label, 0, 1, 2, 3, FILL | EXPAND, FILL | EXPAND); -- cgit v1.2.3