X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftempo_dialog.cc;h=48b54e981f06fba017975689ddff9f7422a195ac;hb=29eac8ee4e813b8e0d48ea04135e7e6ab45af070;hp=18b5e144cbc9a758834fbca92db2b09132e29d6c;hpb=877492ef8a5e5dff23a157d7a7950f027ba51ec1;p=ardour.git diff --git a/gtk2_ardour/tempo_dialog.cc b/gtk2_ardour/tempo_dialog.cc index 18b5e144cb..48b54e981f 100644 --- a/gtk2_ardour/tempo_dialog.cc +++ b/gtk2_ardour/tempo_dialog.cc @@ -23,10 +23,10 @@ #include "gtkmm2ext/utils.h" -#include "ardour_ui.h" #include "tempo_dialog.h" +#include "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Gtk; @@ -34,44 +34,64 @@ using namespace Gtkmm2ext; using namespace ARDOUR; using namespace PBD; -TempoDialog::TempoDialog (TempoMap& map, framepos_t frame, const string&) +TempoDialog::TempoDialog (TempoMap& map, samplepos_t sample, 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) - , when_beat_label (_("beat:"), ALIGN_LEFT, ALIGN_CENTER) - , pulse_selector_label (_("Pulse note"), ALIGN_LEFT, ALIGN_CENTER) + , end_bpm_adjustment (60.0, 1.0, 999.9, 0.1, 1.0) + , end_bpm_spinner (end_bpm_adjustment) + , _end_bpm_label (_("End Beats per Minute:"), 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_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_sample (sample)); + Timecode::BBT_Time when (map.bbt_at_sample (sample)); - init (when, tempo.beats_per_minute(), tempo.note_type(), true); + init (when, tempo.note_types_per_minute(), tempo.end_note_types_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) - , when_beat_label (_("beat:"), ALIGN_LEFT, ALIGN_CENTER) - , pulse_selector_label (_("Pulse note"), ALIGN_LEFT, ALIGN_CENTER) + , end_bpm_adjustment (60.0, 1.0, 999.9, 0.1, 1.0) + , end_bpm_spinner (end_bpm_adjustment) + , _end_bpm_label (_("End Beats per Minute:"), 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_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_sample (section.sample())); + init (when, section.note_types_per_minute(), section.end_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, bool movable) +TempoDialog::init (const Timecode::BBT_Time& when, double bpm, double end_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); + + end_bpm_spinner.set_numeric (true); + end_bpm_spinner.set_digits (3); + end_bpm_spinner.set_wrap (true); + end_bpm_spinner.set_value (end_bpm); + end_bpm_spinner.set_alignment (1.0); + + Gtkmm2ext::set_size_request_to_display_given_text (pulse_selector, _("one-hundred-twenty-eighth"), 3, 6); note_types.insert (make_pair (_("whole"), 1.0)); strings.push_back (_("whole")); @@ -104,31 +124,78 @@ TempoDialog::init (const Timecode::BBT_Time& when, double bpm, double note_type, if (x == note_types.end()) { pulse_selector.set_active_text (strings[3]); // "quarter" } - + + strings.clear(); + + tempo_types.insert (make_pair (_("ramped"), TempoSection::Ramp)); + strings.push_back (_("ramped")); + tempo_types.insert (make_pair (_("constant"), TempoSection::Constant)); + strings.push_back (_("constant")); + set_popdown_strings (tempo_type, strings); + 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 (ARDOUR_UI::config()->get_allow_non_quarter_pulse()) { - table = manage (new Table (5, 5)); + if (UIConfiguration::instance().get_allow_non_quarter_pulse()) { + table = manage (new Table (5, 7)); } else { - table = manage (new Table (5, 4)); + table = manage (new Table (5, 6)); } table->set_spacings (6); 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); + int row = 0; - if (ARDOUR_UI::config()->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 { - row = 1; + if (UIConfiguration::instance().get_allow_non_quarter_pulse()) { + table->attach (pulse_selector_label, 0, 1, row, row + 1); + table->attach (pulse_selector, 1, 5, row, row + 1); + + ++row; } + Label* bpm_label = manage (new Label(_("Start 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; + + table->attach (_end_bpm_label, 0, 1, row, row + 1); + table->attach (end_bpm_spinner, 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, row + 1); + table->attach (tempo_type, 1, 5, row, row + 1); + + ++row; + char buf[64]; snprintf (buf, sizeof (buf), "%" PRIu32, when.bars); @@ -136,9 +203,11 @@ 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); + when_beat_entry.set_alignment (1.0); when_bar_label.set_name ("MetricLabel"); when_beat_label.set_name ("MetricLabel"); @@ -151,10 +220,20 @@ 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; } get_vbox()->set_border_width (12); get_vbox()->pack_end (*table); + table->show_all (); add_button (Stock::CANCEL, RESPONSE_CANCEL); @@ -163,9 +242,12 @@ TempoDialog::init (const Timecode::BBT_Time& when, double bpm, double note_type, set_default_response (RESPONSE_ACCEPT); bpm_spinner.show (); + end_bpm_spinner.show (); tap_tempo_button.show (); + get_vbox()->set_spacing (6); get_vbox()->pack_end (tap_tempo_button); - bpm_spinner.grab_focus (); + tap_tempo_button.can_focus (); + tap_tempo_button.grab_focus (); set_name ("MetricDialog"); @@ -173,12 +255,21 @@ TempoDialog::init (const Timecode::BBT_Time& when, double bpm, double note_type, bpm_spinner.signal_button_press_event().connect (sigc::mem_fun (*this, &TempoDialog::bpm_button_press), false); bpm_spinner.signal_button_release_event().connect (sigc::mem_fun (*this, &TempoDialog::bpm_button_release), false); bpm_spinner.signal_changed().connect (sigc::mem_fun (*this, &TempoDialog::bpm_changed)); + end_bpm_spinner.signal_changed().connect (sigc::mem_fun (*this, &TempoDialog::bpm_changed)); when_bar_entry.signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &TempoDialog::response), RESPONSE_ACCEPT)); when_bar_entry.signal_key_release_event().connect (sigc::mem_fun (*this, &TempoDialog::entry_key_release), false); when_beat_entry.signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &TempoDialog::response), RESPONSE_ACCEPT)); 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)); - tap_tempo_button.signal_clicked().connect (sigc::mem_fun (*this, &TempoDialog::tap_tempo)); + 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_key_press_event().connect (sigc::mem_fun (*this, &TempoDialog::tap_tempo_key_press), false); + tap_tempo_button.signal_focus_out_event().connect (sigc::mem_fun (*this, &TempoDialog::tap_tempo_focus_out)); + + tempo_type_change(); + + tapped = false; } bool @@ -213,7 +304,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; } @@ -223,6 +322,16 @@ TempoDialog::get_bpm () return bpm_spinner.get_value (); } +double +TempoDialog::get_end_bpm () +{ + if (get_tempo_type() == TempoSection::Constant) { + return bpm_spinner.get_value (); + } + + return end_bpm_spinner.get_value (); +} + bool TempoDialog::get_bbt_time (Timecode::BBT_Time& requested) { @@ -243,7 +352,7 @@ double TempoDialog::get_note_type () { NoteTypes::iterator x = note_types.find (pulse_selector.get_active_text()); - + if (x == note_types.end()) { error << string_compose(_("incomprehensible pulse note type (%1)"), pulse_selector.get_active_text()) << endmsg; return 0; @@ -252,62 +361,142 @@ TempoDialog::get_note_type () return x->second; } +TempoSection::Type +TempoDialog::get_tempo_type () +{ + TempoTypes::iterator x = tempo_types.find (tempo_type.get_active_text()); + + if (x == tempo_types.end()) { + 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; +} + void TempoDialog::pulse_change () { set_response_sensitive (RESPONSE_ACCEPT, is_user_input_valid()); } +void +TempoDialog::tempo_type_change () +{ + if (get_tempo_type() == TempoSection::Constant) { + end_bpm_spinner.hide (); + _end_bpm_label.hide(); + } else { + end_bpm_spinner.show (); + _end_bpm_label.show(); + } + + 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_key_press (GdkEventKey*) +{ + tap_tempo (); + return false; +} + +bool +TempoDialog::tap_tempo_button_press (GdkEventButton* ev) +{ + if (ev->type == GDK_2BUTTON_PRESS || ev->type == GDK_3BUTTON_PRESS) { + return true; + } + if (ev->button != 1) { + return true; + } + tap_tempo (); + return false; // grab focus +} + void TempoDialog::tap_tempo () { - gint64 now; - now = g_get_monotonic_time (); // microseconds - - if (last_tap > 0) { - double interval, bpm; - static const double decay = 0.5; - - interval = (now - last_tap) * 1.0e-6; - if (interval <= 6.0) { - // >= 10 bpm, say - if (average_interval > 0) { - average_interval = interval * decay - + average_interval * (1.0-decay); - } else { - average_interval = interval; - } - - bpm = 60.0 / average_interval; - bpm_spinner.set_value (bpm); + double t; + + // Linear least-squares regression + if (tapped) { + t = 1e-6 * (g_get_monotonic_time () - first_t); // Subtract first_t to avoid precision problems + + double n = tap_count; + sum_y += t; + sum_x += n; + sum_xy += n * t; + sum_xx += n * n; + double T = (sum_xy/n - sum_x/n * sum_y/n) / (sum_xx/n - sum_x/n * sum_x/n); + + if (t - last_t < T / 1.2 || t - last_t > T * 1.2) { + tapped = false; } else { - average_interval = 0; + bpm_spinner.set_value (60.0 / T); } - } else { - average_interval = 0; } - last_tap = now; + if (!tapped) { + first_t = g_get_monotonic_time (); + t = 0.0; + sum_y = 0.0; + sum_x = 1.0; + sum_xy = 0.0; + sum_xx = 1.0; + tap_count = 1.0; + + tapped = true; + } + tap_count++; + last_t = t; +} + +bool +TempoDialog::tap_tempo_focus_out (GdkEventFocus* ) +{ + tapped = false; + return false; } -MeterDialog::MeterDialog (TempoMap& map, framepos_t frame, const string&) +MeterDialog::MeterDialog (TempoMap& map, samplepos_t sample, const string&) : ArdourDialog (_("New Meter")) { - Timecode::BBT_Time when; - frame = map.round_to_bar(frame, RoundNearest); - Meter meter (map.meter_at(frame)); + sample = map.round_to_bar(sample, RoundNearest).sample; + Timecode::BBT_Time when (map.bbt_at_sample (sample)); + Meter meter (map.meter_at_sample (sample)); - map.bbt_time (frame, when); - init (when, meter.divisions_per_bar(), meter.note_divisor(), true); + init (when, meter.divisions_per_bar(), meter.note_divisor(), false, 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_sample (section.sample())); + + 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) +MeterDialog::init (const Timecode::BBT_Time& when, double bpb, double divisor, bool initial, PositionLockStyle style) { char buf[64]; vector strings; @@ -316,6 +505,7 @@ MeterDialog::init (const Timecode::BBT_Time& when, double bpb, double divisor, b snprintf (buf, sizeof (buf), "%.2f", bpb); bpb_entry.set_text (buf); bpb_entry.select_region (0, -1); + bpb_entry.set_alignment (1.0); note_types.insert (make_pair (_("whole"), 1.0)); strings.push_back (_("whole")); @@ -344,29 +534,52 @@ MeterDialog::init (const Timecode::BBT_Time& when, double bpb, double divisor, b break; } } - + if (x == note_types.end()) { note_type.set_active_text (strings[3]); // "quarter" } - Label* note_label = manage (new Label (_("Note value:"), ALIGN_LEFT, ALIGN_CENTER)); - Label* bpb_label = manage (new Label (_("Beats per bar:"), ALIGN_LEFT, ALIGN_CENTER)); - Table* table = manage (new Table (3, 2)); + 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_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); 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); + 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); 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); @@ -387,6 +600,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 @@ -455,7 +670,13 @@ MeterDialog::entry_key_release (GdkEventKey*) void MeterDialog::note_type_change () { - set_response_sensitive (RESPONSE_ACCEPT, is_user_input_valid()); + set_response_sensitive (RESPONSE_ACCEPT, is_user_input_valid()); +} + +void +MeterDialog::lock_style_change () +{ + set_response_sensitive (RESPONSE_ACCEPT, is_user_input_valid()); } double @@ -474,7 +695,7 @@ double MeterDialog::get_note_type () { NoteTypes::iterator x = note_types.find (note_type.get_active_text()); - + if (x == note_types.end()) { error << string_compose(_("incomprehensible meter note type (%1)"), note_type.get_active_text()) << endmsg; return 0; @@ -483,6 +704,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) {