X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftempo_dialog.h;h=ba269a44259a1408c7e4c3a14ed5346d2255fab7;hb=6ee23029a338951705c589be6c61ab52099758b6;hp=c1a88367ca2c1a76ed94997296c4042466edf8b8;hpb=c2da4ec8f988f6f8b9e426b03222a2c687c72edb;p=ardour.git

diff --git a/gtk2_ardour/tempo_dialog.h b/gtk2_ardour/tempo_dialog.h
index c1a88367ca..ba269a4425 100644
--- a/gtk2_ardour/tempo_dialog.h
+++ b/gtk2_ardour/tempo_dialog.h
@@ -38,58 +38,60 @@
 class TempoDialog : public ArdourDialog
 {
 public:
-	TempoDialog (ARDOUR::TempoMap&, nframes_t, const std::string & action);
+	TempoDialog (ARDOUR::TempoMap&, framepos_t, const std::string & action);
 	TempoDialog (ARDOUR::TempoSection&, const std::string & action);
 
 	double get_bpm ();
 	double get_note_type ();
-	bool   get_bbt_time (ARDOUR::BBT_Time&);
+	bool   get_bbt_time (Timecode::BBT_Time&);
 
 private:
-	void init (const ARDOUR::BBT_Time& start, double, double, bool);
+	void init (const Timecode::BBT_Time& start, double, double, bool);
 	void bpm_changed ();
 	bool bpm_button_press (GdkEventButton* );
 	bool bpm_button_release (GdkEventButton* );
 	bool entry_key_release (GdkEventKey* );
-	void note_types_change ();
+	void pulse_change ();
 
-	Gtk::ComboBoxText note_types;
-	std::vector<std::string> strings;
+	typedef std::map<std::string,float> NoteTypes;
+	NoteTypes note_types;
+
+	Gtk::ComboBoxText pulse_selector;
 	Gtk::Adjustment   bpm_adjustment;
 	Gtk::SpinButton   bpm_spinner;
-	Gtk::Button  ok_button;
-	Gtk::Button  cancel_button;
 	Gtk::Entry   when_bar_entry;
 	Gtk::Entry   when_beat_entry;
 	Gtk::Label   when_bar_label;
 	Gtk::Label   when_beat_label;
-	char buf[64];
+	Gtk::Label   pulse_selector_label;
 };
 
 class MeterDialog : public ArdourDialog
 {
 public:
-	
-	MeterDialog (ARDOUR::TempoMap&, nframes_t, const std::string & action);
+
+	MeterDialog (ARDOUR::TempoMap&, framepos_t, const std::string & action);
 	MeterDialog (ARDOUR::MeterSection&, const std::string & action);
 
 	double get_bpb ();
 	double get_note_type ();
-	bool   get_bbt_time (ARDOUR::BBT_Time&);
+	bool   get_bbt_time (Timecode::BBT_Time&);
 
 private:
-	void init (const ARDOUR::BBT_Time&, double, double, bool);
+	void init (const Timecode::BBT_Time&, double, double, bool);
 	bool entry_key_press (GdkEventKey* );
 	bool entry_key_release (GdkEventKey* );
-	void note_types_change ();
+	void note_type_change ();
+
+	typedef std::map<std::string,float> NoteTypes;
+	NoteTypes note_types;
 
 	Gtk::Entry   bpb_entry;
-	Gtk::ComboBoxText note_types;
+	Gtk::ComboBoxText note_type;
 	std::vector<std::string> strings;
 	Gtk::Button  ok_button;
 	Gtk::Button  cancel_button;
 	Gtk::Entry   when_bar_entry;
-	char buf[64];
 };
 
 #endif /* __ardour_gtk_tempo_dialog_h__ */