X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftempo_dialog.cc;h=c542461631159361d7c3a2d9074f6aca1c3f8d0a;hb=54fd56de755a44420d906ad660b18c2d671f1057;hp=0d982a408540cfd504871a4d56a03ae4cb3eff0c;hpb=4d9b6a4ced0b7b165284df365331578958f72aa6;p=ardour.git diff --git a/gtk2_ardour/tempo_dialog.cc b/gtk2_ardour/tempo_dialog.cc index 0d982a4085..c542461631 100644 --- a/gtk2_ardour/tempo_dialog.cc +++ b/gtk2_ardour/tempo_dialog.cc @@ -26,7 +26,7 @@ #include "tempo_dialog.h" #include "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Gtk; @@ -40,16 +40,15 @@ 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) - , 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; - Tempo tempo (map.tempo_at (frame)); - map.bbt_time (frame, when); + Tempo tempo (map.tempo_at_frame (frame)); + Timecode::BBT_Time when (map.bbt_at_frame (frame)); - init (when, tempo.beats_per_minute(), tempo.note_type(), TempoSection::Constant, true, PositionLockStyle::MusicTime); + init (when, tempo.note_types_per_minute(), tempo.note_type(), TempoSection::Constant, true, MusicTime); } TempoDialog::TempoDialog (TempoMap& map, TempoSection& section, const string&) @@ -58,24 +57,24 @@ 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) - , 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_time (map.frame_at_beat (section.beat()), when); - init (when, section.beats_per_minute(), section.note_type(), section.type(), section.movable(), section.position_lock_style()); + 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.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 strings; 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); @@ -132,9 +131,9 @@ TempoDialog::init (const Timecode::BBT_Time& when, double bpm, double note_type, strings.clear(); - lock_styles.insert (make_pair (_("music"), PositionLockStyle::MusicTime)); + lock_styles.insert (make_pair (_("music"), MusicTime)); strings.push_back (_("music")); - lock_styles.insert (make_pair (_("audio"), PositionLockStyle::AudioTime)); + lock_styles.insert (make_pair (_("audio"), AudioTime)); strings.push_back (_("audio")); set_popdown_strings (lock_style, strings); LockStyles::iterator ls; @@ -160,18 +159,21 @@ TempoDialog::init (const Timecode::BBT_Time& when, double bpm, double note_type, 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); @@ -179,7 +181,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); @@ -196,17 +198,24 @@ TempoDialog::init (const Timecode::BBT_Time& when, double bpm, double note_type, Label* when_label = manage (new Label(_("Tempo begins at"), ALIGN_LEFT, ALIGN_CENTER)); table->attach (*when_label, 0, 1, row, row+1); + + ++row; + ++row; + + 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); + + --row; } - Label* tempo_type_label = manage (new Label(_("Tempo Type:"), ALIGN_LEFT, ALIGN_CENTER)); - table->attach (*tempo_type_label, 0, 1, row+1, row+2); - table->attach (tempo_type, 1, 2, row+1, row + 2); - get_vbox()->set_border_width (12); - get_vbox()->pack_end (*table); - Label* lock_style_label = manage (new Label(_("Lock Style:"), ALIGN_LEFT, ALIGN_CENTER)); - table->attach (*lock_style_label, 0, 1, row+2, row+3); - table->attach (lock_style, 1, 2, row+2, row + 3); + 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); + + ++row; + get_vbox()->set_border_width (12); get_vbox()->pack_end (*table); @@ -219,6 +228,7 @@ TempoDialog::init (const Timecode::BBT_Time& when, double bpm, double note_type, bpm_spinner.show (); tap_tempo_button.show (); + get_vbox()->set_spacing (6); get_vbox()->pack_end (tap_tempo_button); bpm_spinner.grab_focus (); @@ -277,7 +287,7 @@ TempoDialog::entry_key_release (GdkEventKey*) get_bbt_time (bbt); if (_section && is_user_input_valid()) { - set_response_sensitive (RESPONSE_ACCEPT, _map->can_solve_bbt (_section, Tempo (get_bpm(), get_note_type()), bbt)); + set_response_sensitive (RESPONSE_ACCEPT, _map->can_solve_bbt (_section, bbt)); } else { set_response_sensitive (RESPONSE_ACCEPT, is_user_input_valid()); } @@ -340,7 +350,7 @@ TempoDialog::get_lock_style () if (x == lock_styles.end()) { error << string_compose(_("incomprehensible lock style (%1)"), lock_style.get_active_text()) << endmsg; - return PositionLockStyle::MusicTime; + return MusicTime; } return x->second; @@ -413,24 +423,23 @@ TempoDialog::tap_tempo_focus_out (GdkEventFocus* ) MeterDialog::MeterDialog (TempoMap& map, framepos_t frame, const string&) : ArdourDialog (_("New Meter")) { - Timecode::BBT_Time when; - frame = map.round_to_bar(frame, RoundNearest); - Meter meter (map.meter_at(frame)); + frame = map.round_to_bar(frame, RoundNearest).frame; + Timecode::BBT_Time when (map.bbt_at_frame (frame)); + Meter meter (map.meter_at_frame (frame)); - map.bbt_time (frame, when); - init (when, meter.divisions_per_bar(), meter.note_divisor(), true, PositionLockStyle::MusicTime); + init (when, meter.divisions_per_bar(), meter.note_divisor(), false, MusicTime); } 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); - init (when, section.divisions_per_bar(), section.note_divisor(), section.movable(), section.position_lock_style()); + Timecode::BBT_Time when (map.bbt_at_frame (section.frame())); + + 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; @@ -475,9 +484,9 @@ MeterDialog::init (const Timecode::BBT_Time& when, double bpb, double divisor, b strings.clear(); - lock_styles.insert (make_pair (_("music"), PositionLockStyle::MusicTime)); + lock_styles.insert (make_pair (_("music"), MusicTime)); strings.push_back (_("music")); - lock_styles.insert (make_pair (_("audio"), PositionLockStyle::AudioTime)); + lock_styles.insert (make_pair (_("audio"), AudioTime)); strings.push_back (_("audio")); set_popdown_strings (lock_style, strings); LockStyles::iterator ls; @@ -491,9 +500,9 @@ MeterDialog::init (const Timecode::BBT_Time& when, double bpb, double divisor, b 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); @@ -506,7 +515,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); @@ -514,9 +523,6 @@ MeterDialog::init (const Timecode::BBT_Time& when, double bpb, double divisor, b table->attach (*lock_label, 0, 1, 3, 4, FILL|EXPAND, FILL|EXPAND); table->attach (lock_style, 1, 2, 3, 4, FILL|EXPAND, SHRINK); - } else { - table->attach (*lock_label, 0, 1, 2, 3, FILL|EXPAND, FILL|EXPAND); - table->attach (lock_style, 1, 2, 2, 3, FILL|EXPAND, SHRINK); } get_vbox()->set_border_width (12); @@ -648,7 +654,7 @@ MeterDialog::get_lock_style () if (x == lock_styles.end()) { error << string_compose(_("incomprehensible meter lock style (%1)"), lock_style.get_active_text()) << endmsg; - return PositionLockStyle::MusicTime; + return MusicTime; } return x->second;