, _section (0)
, bpm_adjustment (60.0, 1.0, 999.9, 0.1, 1.0)
, bpm_spinner (bpm_adjustment)
- , when_bar_label (_("bar:"), ALIGN_LEFT, ALIGN_CENTER)
- , when_beat_label (_("beat:"), ALIGN_LEFT, ALIGN_CENTER)
- , pulse_selector_label (_("Pulse note"), ALIGN_LEFT, ALIGN_CENTER)
+ , when_bar_label (_("bar:"), ALIGN_RIGHT, ALIGN_CENTER)
+ , when_beat_label (_("beat:"), ALIGN_RIGHT, ALIGN_CENTER)
+ , pulse_selector_label (_("Pulse:"), ALIGN_RIGHT, ALIGN_CENTER)
, tap_tempo_button (_("Tap tempo"))
{
Tempo tempo (map.tempo_at_frame (frame));
, _section (§ion)
, bpm_adjustment (60.0, 1.0, 999.9, 0.1, 1.0)
, bpm_spinner (bpm_adjustment)
- , when_bar_label (_("bar:"), ALIGN_LEFT, ALIGN_CENTER)
- , when_beat_label (_("beat:"), ALIGN_LEFT, ALIGN_CENTER)
- , pulse_selector_label (_("Pulse note"), ALIGN_LEFT, ALIGN_CENTER)
+ , when_bar_label (_("bar:"), ALIGN_RIGHT, ALIGN_CENTER)
+ , when_beat_label (_("beat:"), ALIGN_RIGHT, ALIGN_CENTER)
+ , pulse_selector_label (_("Pulse:"), ALIGN_RIGHT, ALIGN_CENTER)
, 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.locked_to_meter(), 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<string> strings;
NoteTypes::iterator x;
table->set_homogeneous (false);
int row;
- Label* bpm_label = manage (new Label(_("Beats per minute:"), ALIGN_LEFT, ALIGN_CENTER));
- table->attach (*bpm_label, 0, 1, 0, 1);
- table->attach (bpm_spinner, 1, 5, 0, 1);
if (UIConfiguration::instance().get_allow_non_quarter_pulse()) {
- table->attach (pulse_selector_label, 0, 1, 1, 2);
- table->attach (pulse_selector, 1, 5, 1, 2);
- row = 2;
- } else {
+ table->attach (pulse_selector_label, 0, 1, 0, 1);
+ table->attach (pulse_selector, 1, 5, 0, 1);
+
row = 1;
+ } else {
+ row = 0;
}
+ Label* bpm_label = manage (new Label(_("Beats per Minute:"), ALIGN_LEFT, ALIGN_CENTER));
+ table->attach (*bpm_label, 0, 1, row, row + 1);
+ table->attach (bpm_spinner, 1, 5, row, row + 1);
+ ++row;
+
char buf[64];
snprintf (buf, sizeof (buf), "%" PRIu32, when.bars);
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);
++row;
++row;
- Label* lock_style_label = manage (new Label(_("Lock Style:"), ALIGN_LEFT, ALIGN_CENTER));
+ Label* lock_style_label = manage (new Label(_("Lock Style:"), ALIGN_RIGHT, ALIGN_CENTER));
table->attach (*lock_style_label, 0, 1, row, row + 1);
table->attach (lock_style, 1, 5, row, row + 1);
}
- Label* tempo_type_label = manage (new Label(_("Tempo Type:"), ALIGN_LEFT, ALIGN_CENTER));
+ Label* tempo_type_label = manage (new Label(_("Tempo Type:"), ALIGN_RIGHT, ALIGN_CENTER));
table->attach (*tempo_type_label, 0, 1, row, row + 1);
table->attach (tempo_type, 1, 5, row, row + 1);
bpm_spinner.show ();
tap_tempo_button.show ();
+ get_vbox()->set_spacing (6);
get_vbox()->pack_end (tap_tempo_button);
bpm_spinner.grab_focus ();
MeterDialog::MeterDialog (TempoMap& map, framepos_t frame, const string&)
: ArdourDialog (_("New Meter"))
{
- frame = map.round_to_bar(frame, RoundNearest);
+ frame = map.round_to_bar(frame, RoundNearest).frame;
Timecode::BBT_Time when (map.bbt_at_frame (frame));
Meter meter (map.meter_at_frame (frame));
- init (when, meter.divisions_per_bar(), meter.note_divisor(), true, MusicTime);
+ init (when, meter.divisions_per_bar(), meter.note_divisor(), false, MusicTime);
}
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<string> strings;
lock_style.set_active_text (strings[0]); // "music"
}
- Label* note_label = manage (new Label (_("Note value:"), ALIGN_LEFT, ALIGN_CENTER));
- Label* lock_label = manage (new Label (_("Lock style:"), ALIGN_LEFT, ALIGN_CENTER));
- Label* bpb_label = manage (new Label (_("Beats per bar:"), ALIGN_LEFT, ALIGN_CENTER));
+ Label* note_label = manage (new Label (_("Note value:"), ALIGN_RIGHT, ALIGN_CENTER));
+ Label* lock_label = manage (new Label (_("Lock style:"), ALIGN_RIGHT, ALIGN_CENTER));
+ Label* bpb_label = manage (new Label (_("Beats per bar:"), ALIGN_RIGHT, ALIGN_CENTER));
Table* table = manage (new Table (3, 3));
table->set_spacings (6);
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);