X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=gtk2_ardour%2Ftempo_dialog.cc;h=a7a6f4ae759e90d00b535404a748d1c01ff0325b;hb=eedeb4949d16e5415ba790a042c5db6d83580b36;hp=9173393ff5d3bcc04d6a01974bb560cb54029e55;hpb=e0eaea6471e25f4c3797450a96f35fcdbb1c6992;p=ardour.git

diff --git a/gtk2_ardour/tempo_dialog.cc b/gtk2_ardour/tempo_dialog.cc
index 9173393ff5..a7a6f4ae75 100644
--- a/gtk2_ardour/tempo_dialog.cc
+++ b/gtk2_ardour/tempo_dialog.cc
@@ -23,9 +23,8 @@
 
 #include "gtkmm2ext/utils.h"
 
-#include "ardour/rc_configuration.h"
-
 #include "tempo_dialog.h"
+#include "ui_config.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"));
@@ -105,10 +105,10 @@ 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"
 	}
-	
+
 	Table* table;
 
-	if (Config->get_allow_non_quarter_pulse()) {
+	if (UIConfiguration::instance().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 (UIConfiguration::instance().get_allow_non_quarter_pulse()) {
 		table->attach (pulse_selector_label, 0, 1, 1, 2);
 		table->attach (pulse_selector, 1, 5, 1, 2);
 		row = 2;
@@ -130,16 +130,18 @@ TempoDialog::init (const Timecode::BBT_Time& when, double bpm, double note_type,
 		row = 1;
 	}
 
-	if (movable) {
-		char buf[64];
+	char buf[64];
 
-		snprintf (buf, sizeof (buf), "%" PRIu32, when.bars);
-		when_bar_entry.set_text (buf);
-		snprintf (buf, sizeof (buf), "%" PRIu32, when.beats);
-		when_beat_entry.set_text (buf);
+	snprintf (buf, sizeof (buf), "%" PRIu32, when.bars);
+	when_bar_entry.set_text (buf);
+	snprintf (buf, sizeof (buf), "%" PRIu32, when.beats);
+	when_beat_entry.set_text (buf);
 
+	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");
@@ -160,12 +162,13 @@ TempoDialog::init (const Timecode::BBT_Time& when, double bpm, double note_type,
 
 	add_button (Stock::CANCEL, RESPONSE_CANCEL);
 	add_button (Stock::APPLY, RESPONSE_ACCEPT);
-	set_response_sensitive (RESPONSE_ACCEPT, false);
+	set_response_sensitive (RESPONSE_ACCEPT, true);
 	set_default_response (RESPONSE_ACCEPT);
 
 	bpm_spinner.show ();
 	tap_tempo_button.show ();
 	get_vbox()->pack_end (tap_tempo_button);
+	bpm_spinner.grab_focus ();
 
 	set_name ("MetricDialog");
 
@@ -178,13 +181,24 @@ 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
+TempoDialog::is_user_input_valid() const
+{
+	return (when_beat_entry.get_text() != "")
+		&& (when_bar_entry.get_text() != "")
+		&& (when_bar_entry.get_text() != "0");
 }
 
 void
 TempoDialog::bpm_changed ()
 {
-	set_response_sensitive (RESPONSE_ACCEPT, true);
+	set_response_sensitive (RESPONSE_ACCEPT, is_user_input_valid());
 }
 
 bool
@@ -198,18 +212,14 @@ TempoDialog::bpm_button_release (GdkEventButton*)
 {
 	/* the value has been modified, accept should work now */
 
-	set_response_sensitive (RESPONSE_ACCEPT, true);
+	set_response_sensitive (RESPONSE_ACCEPT, is_user_input_valid());
 	return false;
 }
 
 bool
 TempoDialog::entry_key_release (GdkEventKey*)
 {
-	if (when_beat_entry.get_text() != "" && when_bar_entry.get_text() != "") {
-	        set_response_sensitive (RESPONSE_ACCEPT, true);
-	} else {
-	        set_response_sensitive (RESPONSE_ACCEPT, false);
-	}
+	set_response_sensitive (RESPONSE_ACCEPT, is_user_input_valid());
 	return false;
 }
 
@@ -239,7 +249,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;
@@ -251,36 +261,60 @@ TempoDialog::get_note_type ()
 void
 TempoDialog::pulse_change ()
 {
-        set_response_sensitive (RESPONSE_ACCEPT, true);
+	set_response_sensitive (RESPONSE_ACCEPT, is_user_input_valid());
 }
 
-void
-TempoDialog::tap_tempo ()
+bool
+TempoDialog::tap_tempo_button_press (GdkEventButton *ev)
 {
-	struct timeval now;
-	gettimeofday (&now, NULL);
-
-	if (last_tap.tv_sec >= 0 || last_tap.tv_usec > 0) {
-		struct timeval diff;
-		double interval, bpm;
-		timersub (&now, &last_tap, &diff);
-		interval = diff.tv_sec + diff.tv_usec * 1.0e-6;
-	
-		bpm = 60.0 / interval;
-		if (bpm >= 20) {
-			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 {
+			bpm_spinner.set_value (60.0 / T);
 		}
 	}
-	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;
 
-	
+	return true;
+}
+
+bool
+TempoDialog::tap_tempo_focus_out (GdkEventFocus* )
+{
+	tapped = false;
+	return false;
 }
 
 MeterDialog::MeterDialog (TempoMap& map, framepos_t frame, const string&)
 	: ArdourDialog (_("New Meter"))
 {
 	Timecode::BBT_Time when;
-	frame = map.round_to_bar(frame,0);
+	frame = map.round_to_bar(frame, RoundNearest);
 	Meter meter (map.meter_at(frame));
 
 	map.bbt_time (frame, when);
@@ -303,6 +337,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"));
@@ -331,7 +366,7 @@ 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"
 	}
@@ -346,18 +381,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);
@@ -365,7 +397,7 @@ MeterDialog::init (const Timecode::BBT_Time& when, double bpb, double divisor, b
 
 	add_button (Stock::CANCEL, RESPONSE_CANCEL);
 	add_button (Stock::APPLY, RESPONSE_ACCEPT);
-	set_response_sensitive (RESPONSE_ACCEPT, false);
+	set_response_sensitive (RESPONSE_ACCEPT, true);
 	set_default_response (RESPONSE_ACCEPT);
 
 	get_vbox()->show_all ();
@@ -380,6 +412,14 @@ MeterDialog::init (const Timecode::BBT_Time& when, double bpb, double divisor, b
 	note_type.signal_changed().connect (sigc::mem_fun (*this, &MeterDialog::note_type_change));
 }
 
+bool
+MeterDialog::is_user_input_valid() const
+{
+	return (when_bar_entry.get_text() != "")
+		&& (when_bar_entry.get_text() != "0")
+		&& (bpb_entry.get_text() != "");
+}
+
 bool
 MeterDialog::entry_key_press (GdkEventKey* ev)
 {
@@ -431,18 +471,14 @@ MeterDialog::entry_key_press (GdkEventKey* ev)
 bool
 MeterDialog::entry_key_release (GdkEventKey*)
 {
-        if (when_bar_entry.get_text() != "" && bpb_entry.get_text() != "") {
-	        set_response_sensitive (RESPONSE_ACCEPT, true);
-	} else {
-	        set_response_sensitive (RESPONSE_ACCEPT, false);
-	}
+	set_response_sensitive (RESPONSE_ACCEPT, is_user_input_valid());
 	return false;
 }
 
 void
 MeterDialog::note_type_change ()
 {
-        set_response_sensitive (RESPONSE_ACCEPT, true);
+        set_response_sensitive (RESPONSE_ACCEPT, is_user_input_valid());
 }
 
 double
@@ -461,7 +497,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;