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 a16d224354260c7bc6b340f59af4e0b8d054be5e..d430f2252316160d85bc3abf15555194cbad2190 100644 (file)
--- a/gtk2_ardour/tempo_dialog.cc
+++ b/gtk2_ardour/tempo_dialog.cc
@@ -181,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
@@ -261,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"))
 {