synchronize preferences and monitor-section

[ardour.git] / gtk2_ardour / tempo_dialog.h

diff --git a/gtk2_ardour/tempo_dialog.h b/gtk2_ardour/tempo_dialog.h
index 7e2f83de7c8593f2633c0a7e0c4414aa0f1b0715..616be2433e3cf4c0d4cf49dc6ae19c02d6bf0c69 100644 (file)
--- a/gtk2_ardour/tempo_dialog.h
+++ b/gtk2_ardour/tempo_dialog.h
@@ -51,25 +51,30 @@ private:
        bool bpm_button_press (GdkEventButton* );
        bool bpm_button_release (GdkEventButton* );
        bool entry_key_release (GdkEventKey* );
-       void note_types_change ();
+       void pulse_change ();
+       void tap_tempo ();
 
-       Gtk::ComboBoxText note_types;
-       std::vector<std::string> strings;
+       typedef std::map<std::string,float> NoteTypes;
+       NoteTypes note_types;
+
+       gint64 last_tap;
+       double average_interval;
+
+       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;
+       Gtk::Button  tap_tempo_button;
 };
 
 class MeterDialog : public ArdourDialog
 {
 public:
-       
+
        MeterDialog (ARDOUR::TempoMap&, framepos_t, const std::string & action);
        MeterDialog (ARDOUR::MeterSection&, const std::string & action);
 
@@ -81,15 +86,17 @@ private:
        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__ */