projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix yet another oversight for the windows icon file update
[ardour.git]
/
gtk2_ardour
/
tempo_dialog.cc
diff --git
a/gtk2_ardour/tempo_dialog.cc
b/gtk2_ardour/tempo_dialog.cc
index 6d073e12c7d0bdeb3cf49fb6a03ef7d4dc3b203b..c542461631159361d7c3a2d9074f6aca1c3f8d0a 100644
(file)
--- a/
gtk2_ardour/tempo_dialog.cc
+++ b/
gtk2_ardour/tempo_dialog.cc
@@
-40,9
+40,9
@@
TempoDialog::TempoDialog (TempoMap& map, framepos_t frame, const string&)
, _section (0)
, bpm_adjustment (60.0, 1.0, 999.9, 0.1, 1.0)
, bpm_spinner (bpm_adjustment)
, _section (0)
, bpm_adjustment (60.0, 1.0, 999.9, 0.1, 1.0)
, bpm_spinner (bpm_adjustment)
- , when_bar_label (_("bar:"), ALIGN_
LEF
T, ALIGN_CENTER)
- , when_beat_label (_("beat:"), ALIGN_
LEF
T, ALIGN_CENTER)
- , pulse_selector_label (_("Pulse
note"), ALIGN_LEF
T, ALIGN_CENTER)
+ , when_bar_label (_("bar:"), ALIGN_
RIGH
T, ALIGN_CENTER)
+ , when_beat_label (_("beat:"), ALIGN_
RIGH
T, ALIGN_CENTER)
+ , pulse_selector_label (_("Pulse
:"), ALIGN_RIGH
T, ALIGN_CENTER)
, tap_tempo_button (_("Tap tempo"))
{
Tempo tempo (map.tempo_at_frame (frame));
, tap_tempo_button (_("Tap tempo"))
{
Tempo tempo (map.tempo_at_frame (frame));
@@
-57,13
+57,14
@@
TempoDialog::TempoDialog (TempoMap& map, TempoSection& section, const string&)
, _section (§ion)
, bpm_adjustment (60.0, 1.0, 999.9, 0.1, 1.0)
, bpm_spinner (bpm_adjustment)
, _section (§ion)
, bpm_adjustment (60.0, 1.0, 999.9, 0.1, 1.0)
, bpm_spinner (bpm_adjustment)
- , when_bar_label (_("bar:"), ALIGN_
LEF
T, ALIGN_CENTER)
- , when_beat_label (_("beat:"), ALIGN_
LEF
T, ALIGN_CENTER)
- , pulse_selector_label (_("Pulse
note"), ALIGN_LEF
T, ALIGN_CENTER)
+ , when_bar_label (_("bar:"), ALIGN_
RIGH
T, ALIGN_CENTER)
+ , when_beat_label (_("beat:"), ALIGN_
RIGH
T, ALIGN_CENTER)
+ , pulse_selector_label (_("Pulse
:"), ALIGN_RIGH
T, ALIGN_CENTER)
, tap_tempo_button (_("Tap tempo"))
{
Timecode::BBT_Time when (map.bbt_at_frame (section.frame()));
, 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.initial(), 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
}
void
@@
-73,7
+74,7
@@
TempoDialog::init (const Timecode::BBT_Time& when, double bpm, double note_type,
NoteTypes::iterator x;
bpm_spinner.set_numeric (true);
NoteTypes::iterator x;
bpm_spinner.set_numeric (true);
- bpm_spinner.set_digits (
2
);
+ bpm_spinner.set_digits (
3
);
bpm_spinner.set_wrap (true);
bpm_spinner.set_value (bpm);
bpm_spinner.set_alignment (1.0);
bpm_spinner.set_wrap (true);
bpm_spinner.set_value (bpm);
bpm_spinner.set_alignment (1.0);
@@
-158,18
+159,21
@@
TempoDialog::init (const Timecode::BBT_Time& when, double bpm, double note_type,
table->set_homogeneous (false);
int row;
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()) {
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;
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);
char buf[64];
snprintf (buf, sizeof (buf), "%" PRIu32, when.bars);
@@
-198,7
+202,7
@@
TempoDialog::init (const Timecode::BBT_Time& when, double bpm, double note_type,
++row;
++row;
++row;
++row;
- Label* lock_style_label = manage (new Label(_("Lock Style:"), ALIGN_
LEF
T, ALIGN_CENTER));
+ Label* lock_style_label = manage (new Label(_("Lock Style:"), ALIGN_
RIGH
T, ALIGN_CENTER));
table->attach (*lock_style_label, 0, 1, row, row + 1);
table->attach (lock_style, 1, 5, row, row + 1);
table->attach (*lock_style_label, 0, 1, row, row + 1);
table->attach (lock_style, 1, 5, row, row + 1);
@@
-206,7
+210,7
@@
TempoDialog::init (const Timecode::BBT_Time& when, double bpm, double note_type,
}
}
- Label* tempo_type_label = manage (new Label(_("Tempo Type:"), ALIGN_
LEF
T, ALIGN_CENTER));
+ Label* tempo_type_label = manage (new Label(_("Tempo Type:"), ALIGN_
RIGH
T, ALIGN_CENTER));
table->attach (*tempo_type_label, 0, 1, row, row + 1);
table->attach (tempo_type, 1, 5, row, row + 1);
table->attach (*tempo_type_label, 0, 1, row, row + 1);
table->attach (tempo_type, 1, 5, row, row + 1);
@@
-224,6
+228,7
@@
TempoDialog::init (const Timecode::BBT_Time& when, double bpm, double note_type,
bpm_spinner.show ();
tap_tempo_button.show ();
bpm_spinner.show ();
tap_tempo_button.show ();
+ get_vbox()->set_spacing (6);
get_vbox()->pack_end (tap_tempo_button);
bpm_spinner.grab_focus ();
get_vbox()->pack_end (tap_tempo_button);
bpm_spinner.grab_focus ();
@@
-418,7
+423,7
@@
TempoDialog::tap_tempo_focus_out (GdkEventFocus* )
MeterDialog::MeterDialog (TempoMap& map, framepos_t frame, const string&)
: ArdourDialog (_("New Meter"))
{
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));
Timecode::BBT_Time when (map.bbt_at_frame (frame));
Meter meter (map.meter_at_frame (frame));
@@
-495,9
+500,9
@@
MeterDialog::init (const Timecode::BBT_Time& when, double bpb, double divisor, b
lock_style.set_active_text (strings[0]); // "music"
}
lock_style.set_active_text (strings[0]); // "music"
}
- Label* note_label = manage (new Label (_("Note value:"), ALIGN_
LEF
T, ALIGN_CENTER));
- Label* lock_label = manage (new Label (_("Lock style:"), ALIGN_
LEF
T, ALIGN_CENTER));
- Label* bpb_label = manage (new Label (_("Beats per bar:"), ALIGN_
LEF
T, ALIGN_CENTER));
+ Label* note_label = manage (new Label (_("Note value:"), ALIGN_
RIGH
T, ALIGN_CENTER));
+ Label* lock_label = manage (new Label (_("Lock style:"), ALIGN_
RIGH
T, ALIGN_CENTER));
+ Label* bpb_label = manage (new Label (_("Beats per bar:"), ALIGN_
RIGH
T, ALIGN_CENTER));
Table* table = manage (new Table (3, 3));
table->set_spacings (6);
Table* table = manage (new Table (3, 3));
table->set_spacings (6);