X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftempo_dialog.cc;h=436acfaa679a5b2301a65e422412772b5ae96c42;hb=6424a0eab93c85f8b1ff56334f779c1232dfe475;hp=eef19e22a5f686a8709497634293e6d628008ee3;hpb=278ad73259a396e5a2f5f16c037ea1a06d382de6;p=ardour.git diff --git a/gtk2_ardour/tempo_dialog.cc b/gtk2_ardour/tempo_dialog.cc index eef19e22a5..436acfaa67 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; @@ -45,11 +45,10 @@ TempoDialog::TempoDialog (TempoMap& map, framepos_t frame, const string&) , pulse_selector_label (_("Pulse note"), ALIGN_LEFT, 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.beats_per_minute(), tempo.note_type(), TempoSection::Constant, true, MusicTime); } TempoDialog::TempoDialog (TempoMap& map, TempoSection& section, const string&) @@ -63,8 +62,7 @@ TempoDialog::TempoDialog (TempoMap& map, TempoSection& section, const string&) , pulse_selector_label (_("Pulse note"), ALIGN_LEFT, ALIGN_CENTER) , tap_tempo_button (_("Tap tempo")) { - Timecode::BBT_Time when; - map.bbt_time (map.frame_at_beat (section.beat()), when); + Timecode::BBT_Time when (map.bbt_at_frame (section.frame())); init (when, section.beats_per_minute(), section.note_type(), section.type(), section.movable(), section.position_lock_style()); } @@ -132,9 +130,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; @@ -196,17 +194,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_LEFT, 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); + table->attach (*tempo_type_label, 0, 1, row, row + 1); + table->attach (tempo_type, 1, 5, row, row + 1); + + ++row; - 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); get_vbox()->set_border_width (12); get_vbox()->pack_end (*table); @@ -277,7 +282,7 @@ TempoDialog::entry_key_release (GdkEventKey*) get_bbt_time (bbt); if (_section && is_user_input_valid()) { - set_response_sensitive (RESPONSE_ACCEPT, _map->bbt_valid (_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 +345,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,19 +418,18 @@ 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)); + 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(), true, 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); + 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()); } @@ -475,9 +479,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; @@ -514,9 +518,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 +649,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;