X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftempo_dialog.h;h=f9f0dd34a01e423b107b4b6a9022cc0d43344a8d;hb=95a61717faa4b427be0e7821ee91f7df81065815;hp=97d89e286709e1c0ce0445bfadf9603e4d10014a;hpb=ee959e73fd02c5eefc56a27d23e9ce847b0fab55;p=ardour.git

diff --git a/gtk2_ardour/tempo_dialog.h b/gtk2_ardour/tempo_dialog.h
index 97d89e2867..f9f0dd34a0 100644
--- a/gtk2_ardour/tempo_dialog.h
+++ b/gtk2_ardour/tempo_dialog.h
@@ -38,65 +38,95 @@
 class TempoDialog : public ArdourDialog
 {
 public:
-	TempoDialog (ARDOUR::TempoMap&, framepos_t, const std::string & action);
-	TempoDialog (ARDOUR::TempoSection&, const std::string & action);
+	TempoDialog (ARDOUR::TempoMap&, samplepos_t, const std::string & action);
+	TempoDialog (ARDOUR::TempoMap&, ARDOUR::TempoSection&, const std::string & action);
 
 	double get_bpm ();
+	double get_end_bpm ();
 	double get_note_type ();
 	bool   get_bbt_time (Timecode::BBT_Time&);
+	ARDOUR::TempoSection::Type get_tempo_type ();
+	ARDOUR::PositionLockStyle get_lock_style ();
 
 private:
-	void init (const Timecode::BBT_Time& start, double, double, bool);
+	void init (const Timecode::BBT_Time& start, double bpm, double end_bpm, double note_type, ARDOUR::TempoSection::Type type, bool movable, ARDOUR::PositionLockStyle style);
 	bool is_user_input_valid() const;
 	void bpm_changed ();
 	bool bpm_button_press (GdkEventButton* );
 	bool bpm_button_release (GdkEventButton* );
 	bool entry_key_release (GdkEventKey* );
 	void pulse_change ();
-	bool tap_tempo_button_press (GdkEventButton* );
+	void tempo_type_change ();
+	void lock_style_change ();
+	bool tap_tempo_key_press (GdkEventKey*);
+	bool tap_tempo_button_press (GdkEventButton*);
 	bool tap_tempo_focus_out (GdkEventFocus* );
 
+	void tap_tempo ();
+
 	typedef std::map<std::string,float> NoteTypes;
 	NoteTypes note_types;
 
+	typedef std::map<std::string, ARDOUR::TempoSection::Type> TempoTypes;
+	TempoTypes tempo_types;
+
+	typedef std::map<std::string, ARDOUR::PositionLockStyle> LockStyles;
+	LockStyles lock_styles;
+
 	bool tapped;      // whether the tap-tempo button has been clicked
-	guint32 last_tap; // time of the last tap (in mS, from GdkEventButton::time). Only valid if tapped is true
-	double average_interval; // running average of tap tempo button press interval times
+	double sum_x, sum_xx, sum_xy, sum_y;
+	double tap_count;
+	double last_t;
+	gint64 first_t;
+
+	ARDOUR::TempoMap* _map;
+	ARDOUR::TempoSection* _section;
 
 	Gtk::ComboBoxText pulse_selector;
 	Gtk::Adjustment   bpm_adjustment;
 	Gtk::SpinButton   bpm_spinner;
+	Gtk::Adjustment   end_bpm_adjustment;
+	Gtk::SpinButton   end_bpm_spinner;
+	Gtk::Label   _end_bpm_label;
 	Gtk::Entry   when_bar_entry;
 	Gtk::Entry   when_beat_entry;
 	Gtk::Label   when_bar_label;
 	Gtk::Label   when_beat_label;
 	Gtk::Label   pulse_selector_label;
 	Gtk::Button  tap_tempo_button;
+	Gtk::ComboBoxText tempo_type;
+	Gtk::ComboBoxText lock_style;
 };
 
 class MeterDialog : public ArdourDialog
 {
 public:
 
-	MeterDialog (ARDOUR::TempoMap&, framepos_t, const std::string & action);
-	MeterDialog (ARDOUR::MeterSection&, const std::string & action);
+	MeterDialog (ARDOUR::TempoMap&, samplepos_t, const std::string & action);
+	MeterDialog (ARDOUR::TempoMap&, ARDOUR::MeterSection&, const std::string & action);
 
 	double get_bpb ();
 	double get_note_type ();
+	ARDOUR::PositionLockStyle get_lock_style ();
 	bool   get_bbt_time (Timecode::BBT_Time&);
 
 private:
-	void init (const Timecode::BBT_Time&, double, double, bool);
+	void init (const Timecode::BBT_Time&, double, double, bool, ARDOUR::PositionLockStyle style);
 	bool is_user_input_valid() const;
 	bool entry_key_press (GdkEventKey* );
 	bool entry_key_release (GdkEventKey* );
 	void note_type_change ();
+	void lock_style_change ();
 
 	typedef std::map<std::string,float> NoteTypes;
 	NoteTypes note_types;
 
+	typedef std::map<std::string, ARDOUR::PositionLockStyle> LockStyles;
+	LockStyles lock_styles;
+
 	Gtk::Entry   bpb_entry;
 	Gtk::ComboBoxText note_type;
+	Gtk::ComboBoxText lock_style;
 	std::vector<std::string> strings;
 	Gtk::Button  ok_button;
 	Gtk::Button  cancel_button;