X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Ftempo_dialog.cc;h=b8f5a0c531470d5dfeae32f01802112c8cc409d8;hb=bc42dea451a5cfce4d7ede70a4c14f208fcaeb3c;hp=d430f2252316160d85bc3abf15555194cbad2190;hpb=91fac4c96dc6210dcc056da70dc608700d7eb570;p=ardour.git

diff --git a/gtk2_ardour/tempo_dialog.cc b/gtk2_ardour/tempo_dialog.cc
index d430f22523..b8f5a0c531 100644
--- a/gtk2_ardour/tempo_dialog.cc
+++ b/gtk2_ardour/tempo_dialog.cc
@@ -23,8 +23,8 @@
 
 #include "gtkmm2ext/utils.h"
 
-#include "ardour_ui.h"
 #include "tempo_dialog.h"
+#include "ui_config.h"
 
 #include "i18n.h"
 
@@ -47,10 +47,10 @@ TempoDialog::TempoDialog (TempoMap& map, framepos_t frame, const string&)
 	Tempo tempo (map.tempo_at (frame));
 	map.bbt_time (frame, when);
 
-	init (when, tempo.beats_per_minute(), tempo.note_type(), true);
+	init (when, tempo.beats_per_minute(), tempo.note_type(), TempoSection::Constant, true, PositionLockStyle::MusicTime);
 }
 
-TempoDialog::TempoDialog (TempoSection& section, const string&)
+TempoDialog::TempoDialog (TempoMap& map, TempoSection& section, const string&)
 	: ArdourDialog (_("Edit Tempo"))
 	, bpm_adjustment (60.0, 1.0, 999.9, 0.1, 1.0)
 	, bpm_spinner (bpm_adjustment)
@@ -59,11 +59,13 @@ 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_time (map.frame_at_beat (section.beat()), when);
+	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<string> strings;
 	NoteTypes::iterator x;
@@ -105,13 +107,49 @@ 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"), PositionLockStyle::MusicTime));
+	strings.push_back (_("music"));
+	lock_styles.insert (make_pair (_("audio"), PositionLockStyle::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);
@@ -122,7 +160,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 (ARDOUR_UI::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;
@@ -156,8 +194,18 @@ TempoDialog::init (const Timecode::BBT_Time& when, double bpm, double note_type,
 		table->attach (*when_label, 0, 1, row, row+1);
 	}
 
+	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);
 	get_vbox()->set_border_width (12);
 	get_vbox()->pack_end (*table);
+
+	Label* lock_style_label = manage (new Label(_("Lock Style:"), ALIGN_LEFT, ALIGN_CENTER));
+	table->attach (*lock_style_label, 0, 1, row+2, row+3);
+	table->attach (lock_style, 1, 2, row+2, row + 3);
+	get_vbox()->set_border_width (12);
+	get_vbox()->pack_end (*table);
+
 	table->show_all ();
 
 	add_button (Stock::CANCEL, RESPONSE_CANCEL);
@@ -181,6 +229,8 @@ 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));
+	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));
 
@@ -249,7 +299,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;
@@ -258,48 +308,87 @@ 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 PositionLockStyle::MusicTime;
+	}
+
+	return x->second;
+}
+
 void
 TempoDialog::pulse_change ()
 {
 	set_response_sensitive (RESPONSE_ACCEPT, is_user_input_valid());
 }
 
+void
+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)
 {
-	gint64 now;
-	now = g_get_monotonic_time (); // microseconds
+	double t;
 
+	// Linear least-squares regression
 	if (tapped) {
-		double interval, bpm;
-		static const double decay = 0.5;
-
-		interval = (now - last_tap) * 1.0e-6;
-		if (interval <= 6.0) {
-			// <= 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;
-			}
-
-			if (average_interval > 0) {
-				bpm = 60.0 / average_interval;
-				bpm_spinner.set_value (bpm);
-			}
+		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;
+	}
+	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;
 	}
-	last_tap = now;
+	tap_count++;
+	last_t = t;
+
+	return true;
 }
 
 bool
@@ -317,17 +406,19 @@ MeterDialog::MeterDialog (TempoMap& map, framepos_t frame, const string&)
 	Meter meter (map.meter_at(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, PositionLockStyle::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_time (map.frame_at_beat (section.beat()), when);
+	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<string> strings;
@@ -365,14 +456,33 @@ 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"
 	}
 
+	strings.clear();
+
+	lock_styles.insert (make_pair (_("music"), PositionLockStyle::MusicTime));
+	strings.push_back (_("music"));
+	lock_styles.insert (make_pair (_("audio ur brane wul xplod"), PositionLockStyle::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);
@@ -391,6 +501,9 @@ MeterDialog::init (const Timecode::BBT_Time& when, double bpb, double divisor, b
 		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);
 	get_vbox()->pack_start (*table, false, false);
 
@@ -409,6 +522,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
@@ -480,6 +595,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 ()
 {
@@ -496,7 +617,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;
@@ -505,6 +626,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 PositionLockStyle::MusicTime;
+	}
+
+	return x->second;
+}
+
 bool
 MeterDialog::get_bbt_time (Timecode::BBT_Time& requested)
 {