X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftempo_dialog.cc;h=68a781a54f35a49e78680c6c54bf74a47d897298;hb=f2984260d481b7e2b641382e7d593ed701e464a3;hp=2c45d500857b91b874bbc739896c27e1ed6ce3fe;hpb=7898435d3f94355fa0996dc9f85b3bc1ef173585;p=ardour.git diff --git a/gtk2_ardour/tempo_dialog.cc b/gtk2_ardour/tempo_dialog.cc index 2c45d50085..68a781a54f 100644 --- a/gtk2_ardour/tempo_dialog.cc +++ b/gtk2_ardour/tempo_dialog.cc @@ -36,6 +36,8 @@ using namespace PBD; TempoDialog::TempoDialog (TempoMap& map, framepos_t frame, const string&) : ArdourDialog (_("New Tempo")) + , _map (&map) + , _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) @@ -43,15 +45,16 @@ 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(), true); + init (when, tempo.beats_per_minute(), tempo.note_type(), TempoSection::Constant, true, MusicTime); } -TempoDialog::TempoDialog (TempoSection& section, const string&) +TempoDialog::TempoDialog (TempoMap& map, TempoSection& section, const string&) : ArdourDialog (_("Edit Tempo")) + , _map (&map) + , _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) @@ -59,11 +62,12 @@ TempoDialog::TempoDialog (TempoSection& section, const string&) , pulse_selector_label (_("Pulse note"), ALIGN_LEFT, ALIGN_CENTER) , tap_tempo_button (_("Tap tempo")) { - init (section.start(), section.beats_per_minute(), section.note_type(), section.movable()); + 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()); } void -TempoDialog::init (const Timecode::BBT_Time& when, double bpm, double note_type, bool movable) +TempoDialog::init (const Timecode::BBT_Time& when, double bpm, double note_type, TempoSection::Type type, bool movable, PositionLockStyle style) { vector strings; NoteTypes::iterator x; @@ -108,19 +112,46 @@ TempoDialog::init (const Timecode::BBT_Time& when, double bpm, double note_type, strings.clear(); - tempo_types.insert (make_pair (_("ramped"), TempoSection::Type::Ramp)); + tempo_types.insert (make_pair (_("ramped"), TempoSection::Ramp)); strings.push_back (_("ramped")); - tempo_types.insert (make_pair (_("constant"), TempoSection::Type::Constant)); + tempo_types.insert (make_pair (_("constant"), TempoSection::Constant)); strings.push_back (_("constant")); set_popdown_strings (tempo_type, strings); - tempo_type.set_active_text (strings[0]); // "ramped" + TempoTypes::iterator tt; + for (tt = tempo_types.begin(); tt != tempo_types.end(); ++tt) { + if (tt->second == type) { + tempo_type.set_active_text (tt->first); + break; + } + } + if (tt == tempo_types.end()) { + tempo_type.set_active_text (strings[1]); // "constant" + } + + strings.clear(); + + lock_styles.insert (make_pair (_("music"), MusicTime)); + strings.push_back (_("music")); + lock_styles.insert (make_pair (_("audio"), AudioTime)); + strings.push_back (_("audio")); + set_popdown_strings (lock_style, strings); + LockStyles::iterator ls; + for (ls = lock_styles.begin(); ls != lock_styles.end(); ++ls) { + if (ls->second == style) { + lock_style.set_active_text (ls->first); + break; + } + } + if (ls == lock_styles.end()) { + lock_style.set_active_text (strings[0]); // "music" + } Table* table; if (UIConfiguration::instance().get_allow_non_quarter_pulse()) { - table = manage (new Table (5, 6)); + table = manage (new Table (5, 7)); } else { - table = manage (new Table (5, 5)); + table = manage (new Table (5, 6)); } table->set_spacings (6); @@ -163,11 +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); + 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); @@ -195,6 +239,7 @@ TempoDialog::init (const Timecode::BBT_Time& when, double bpm, double note_type, when_beat_entry.signal_key_release_event().connect (sigc::mem_fun (*this, &TempoDialog::entry_key_release), false); pulse_selector.signal_changed().connect (sigc::mem_fun (*this, &TempoDialog::pulse_change)); tempo_type.signal_changed().connect (sigc::mem_fun (*this, &TempoDialog::tempo_type_change)); + lock_style.signal_changed().connect (sigc::mem_fun (*this, &TempoDialog::lock_style_change)); tap_tempo_button.signal_button_press_event().connect (sigc::mem_fun (*this, &TempoDialog::tap_tempo_button_press), false); tap_tempo_button.signal_focus_out_event().connect (sigc::mem_fun (*this, &TempoDialog::tap_tempo_focus_out)); @@ -233,7 +278,15 @@ TempoDialog::bpm_button_release (GdkEventButton*) bool TempoDialog::entry_key_release (GdkEventKey*) { - set_response_sensitive (RESPONSE_ACCEPT, is_user_input_valid()); + Timecode::BBT_Time bbt; + get_bbt_time (bbt); + + if (_section && is_user_input_valid()) { + set_response_sensitive (RESPONSE_ACCEPT, _map->can_solve_bbt (_section, bbt)); + } else { + set_response_sensitive (RESPONSE_ACCEPT, is_user_input_valid()); + } + return false; } @@ -278,8 +331,21 @@ TempoDialog::get_tempo_type () TempoTypes::iterator x = tempo_types.find (tempo_type.get_active_text()); if (x == tempo_types.end()) { - error << string_compose(_("incomprehensible pulse note type (%1)"), tempo_type.get_active_text()) << endmsg; - return TempoSection::Type::Constant; + error << string_compose(_("incomprehensible tempo type (%1)"), tempo_type.get_active_text()) << endmsg; + return TempoSection::Constant; + } + + return x->second; +} + +PositionLockStyle +TempoDialog::get_lock_style () +{ + LockStyles::iterator x = lock_styles.find (lock_style.get_active_text()); + + if (x == lock_styles.end()) { + error << string_compose(_("incomprehensible lock style (%1)"), lock_style.get_active_text()) << endmsg; + return MusicTime; } return x->second; @@ -297,6 +363,12 @@ TempoDialog::tempo_type_change () set_response_sensitive (RESPONSE_ACCEPT, is_user_input_valid()); } +void +TempoDialog::lock_style_change () +{ + set_response_sensitive (RESPONSE_ACCEPT, is_user_input_valid()); +} + bool TempoDialog::tap_tempo_button_press (GdkEventButton *ev) { @@ -346,22 +418,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)); + 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); + init (when, meter.divisions_per_bar(), meter.note_divisor(), true, MusicTime); } -MeterDialog::MeterDialog (MeterSection& section, const string&) +MeterDialog::MeterDialog (TempoMap& map, MeterSection& section, const string&) : ArdourDialog (_("Edit Meter")) { - init (section.start(), section.divisions_per_bar(), section.note_divisor(), section.movable()); + 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()); } void -MeterDialog::init (const Timecode::BBT_Time& when, double bpb, double divisor, bool movable) +MeterDialog::init (const Timecode::BBT_Time& when, double bpb, double divisor, bool movable, PositionLockStyle style) { char buf[64]; vector strings; @@ -404,15 +477,34 @@ MeterDialog::init (const Timecode::BBT_Time& when, double bpb, double divisor, b note_type.set_active_text (strings[3]); // "quarter" } + strings.clear(); + + lock_styles.insert (make_pair (_("music"), MusicTime)); + strings.push_back (_("music")); + lock_styles.insert (make_pair (_("audio"), AudioTime)); + strings.push_back (_("audio")); + set_popdown_strings (lock_style, strings); + LockStyles::iterator ls; + for (ls = lock_styles.begin(); ls != lock_styles.end(); ++ls) { + if (ls->second == style) { + lock_style.set_active_text (ls->first); + break; + } + } + if (ls == lock_styles.end()) { + 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)); - Table* table = manage (new Table (3, 2)); + Table* table = manage (new Table (3, 3)); table->set_spacings (6); table->attach (*bpb_label, 0, 1, 0, 1, FILL|EXPAND, FILL|EXPAND); table->attach (bpb_entry, 1, 2, 0, 1, FILL|EXPAND, FILL|EXPAND); table->attach (*note_label, 0, 1, 1, 2, FILL|EXPAND, FILL|EXPAND); - table->attach (note_type, 1, 2, 1, 2, FILL|EXPAND, SHRINK); + table->attach (note_type, 1, 2, 1, 2, FILL|EXPAND, FILL|EXPAND); snprintf (buf, sizeof (buf), "%" PRIu32, when.bars); when_bar_entry.set_text (buf); @@ -423,6 +515,9 @@ MeterDialog::init (const Timecode::BBT_Time& when, double bpb, double divisor, b table->attach (*when_label, 0, 1, 2, 3, FILL | EXPAND, FILL | EXPAND); table->attach (when_bar_entry, 1, 2, 2, 3, FILL | EXPAND, FILL | EXPAND); + + table->attach (*lock_label, 0, 1, 3, 4, FILL|EXPAND, FILL|EXPAND); + table->attach (lock_style, 1, 2, 3, 4, FILL|EXPAND, SHRINK); } get_vbox()->set_border_width (12); @@ -443,6 +538,8 @@ MeterDialog::init (const Timecode::BBT_Time& when, double bpb, double divisor, b when_bar_entry.signal_key_press_event().connect (sigc::mem_fun (*this, &MeterDialog::entry_key_press), false); when_bar_entry.signal_key_release_event().connect (sigc::mem_fun (*this, &MeterDialog::entry_key_release)); note_type.signal_changed().connect (sigc::mem_fun (*this, &MeterDialog::note_type_change)); + lock_style.signal_changed().connect (sigc::mem_fun (*this, &MeterDialog::lock_style_change)); + } bool @@ -514,6 +611,12 @@ MeterDialog::note_type_change () set_response_sensitive (RESPONSE_ACCEPT, is_user_input_valid()); } +void +MeterDialog::lock_style_change () +{ + set_response_sensitive (RESPONSE_ACCEPT, is_user_input_valid()); +} + double MeterDialog::get_bpb () { @@ -539,6 +642,19 @@ MeterDialog::get_note_type () return x->second; } +PositionLockStyle +MeterDialog::get_lock_style () +{ + LockStyles::iterator x = lock_styles.find (lock_style.get_active_text()); + + if (x == lock_styles.end()) { + error << string_compose(_("incomprehensible meter lock style (%1)"), lock_style.get_active_text()) << endmsg; + return MusicTime; + } + + return x->second; +} + bool MeterDialog::get_bbt_time (Timecode::BBT_Time& requested) {