merge fix for tempo branch

[ardour.git] / gtk2_ardour / tempo_dialog.cc

diff --git a/gtk2_ardour/tempo_dialog.cc b/gtk2_ardour/tempo_dialog.cc
index 95d086478abeb1f178752657da886b26a6b81cb8..d430f2252316160d85bc3abf15555194cbad2190 100644 (file)
--- a/gtk2_ardour/tempo_dialog.cc
+++ b/gtk2_ardour/tempo_dialog.cc
@@ -23,8 +23,7 @@
 
 #include "gtkmm2ext/utils.h"
 
-#include "ardour/rc_configuration.h"
-
+#include "ardour_ui.h"
 #include "tempo_dialog.h"
 
 #include "i18n.h"
@@ -73,6 +72,7 @@ TempoDialog::init (const Timecode::BBT_Time& when, double bpm, double note_type,
        bpm_spinner.set_digits (2);
        bpm_spinner.set_wrap (true);
        bpm_spinner.set_value (bpm);
+       bpm_spinner.set_alignment (1.0);
 
        note_types.insert (make_pair (_("whole"), 1.0));
        strings.push_back (_("whole"));
@@ -108,7 +108,7 @@ TempoDialog::init (const Timecode::BBT_Time& when, double bpm, double note_type,
        
        Table* table;
 
-       if (Config->get_allow_non_quarter_pulse()) {
+       if (ARDOUR_UI::config()->get_allow_non_quarter_pulse()) {
                table = manage (new Table (5, 5));
        } else {
                table = manage (new Table (5, 4));
@@ -122,7 +122,7 @@ TempoDialog::init (const Timecode::BBT_Time& when, double bpm, double note_type,
        table->attach (*bpm_label, 0, 1, 0, 1);
        table->attach (bpm_spinner, 1, 5, 0, 1);
 
-       if (Config->get_allow_non_quarter_pulse()) {
+       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;
@@ -140,6 +140,8 @@ TempoDialog::init (const Timecode::BBT_Time& when, double bpm, double note_type,
        if (movable) {
                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");
@@ -166,6 +168,7 @@ TempoDialog::init (const Timecode::BBT_Time& when, double bpm, double note_type,
        bpm_spinner.show ();
        tap_tempo_button.show ();
        get_vbox()->pack_end (tap_tempo_button);
+       bpm_spinner.grab_focus ();
 
        set_name ("MetricDialog");
 
@@ -178,7 +181,10 @@ TempoDialog::init (const Timecode::BBT_Time& when, double bpm, double note_type,
        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));
+       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));
+
+       tapped = false;
 }
 
 bool
@@ -258,37 +264,51 @@ TempoDialog::pulse_change ()
        set_response_sensitive (RESPONSE_ACCEPT, is_user_input_valid());
 }
 
-void
-TempoDialog::tap_tempo ()
+bool
+TempoDialog::tap_tempo_button_press (GdkEventButton *ev)
 {
        gint64 now;
        now = g_get_monotonic_time (); // microseconds
 
-       if (last_tap > 0) {
+       if (tapped) {
                double interval, bpm;
                static const double decay = 0.5;
 
                interval = (now - last_tap) * 1.0e-6;
                if (interval <= 6.0) {
-                       // >= 10 bpm, say
+                       // <= 6 seconds (say): >= 10 bpm
                        if (average_interval > 0) {
+                               if (average_interval > interval / 1.2 && average_interval < interval * 1.2) {
                                average_interval = interval * decay
                                        + average_interval * (1.0-decay);
+                               } else {
+                                       average_interval = 0;
+                               }
                        } else {
                                average_interval = interval;
                        }
 
-                       bpm = 60.0 / average_interval;
-                       bpm_spinner.set_value (bpm);
+                       if (average_interval > 0) {
+                               bpm = 60.0 / average_interval;
+                               bpm_spinner.set_value (bpm);
+                       }
                } else {
                        average_interval = 0;
                }
        } else {
                average_interval = 0;
+               tapped = true;
        }
        last_tap = now;
 }
 
+bool
+TempoDialog::tap_tempo_focus_out (GdkEventFocus* )
+{
+       tapped = false;
+       return false;
+}
+
 MeterDialog::MeterDialog (TempoMap& map, framepos_t frame, const string&)
        : ArdourDialog (_("New Meter"))
 {
@@ -316,6 +336,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"));
@@ -359,18 +380,15 @@ MeterDialog::init (const Timecode::BBT_Time& when, double bpb, double divisor, b
        table->attach (*note_label, 0, 1, 1, 2, FILL|EXPAND, FILL|EXPAND);
        table->attach (note_type, 1, 2, 1, 2, FILL|EXPAND, SHRINK);
 
-       if (movable) {
-               char buf[64];
-
-               snprintf (buf, sizeof (buf), "%" PRIu32, when.bars);
-               when_bar_entry.set_text (buf);
+       snprintf (buf, sizeof (buf), "%" PRIu32, when.bars);
+       when_bar_entry.set_text (buf);
+       when_bar_entry.set_alignment (1.0);
 
+       if (movable) {
                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);
-       } else {
-               when_bar_entry.set_text ("0");
        }
 
        get_vbox()->set_border_width (12);