update some calls to use new get_preferred_edit_position; needs testing

[ardour.git] / gtk2_ardour / tempo_dialog.h

diff --git a/gtk2_ardour/tempo_dialog.h b/gtk2_ardour/tempo_dialog.h
index b22ef7bc26a3dd2de1482e45c77fd0c433b4814e..eda4e61f1a27a2145086f1629b3d53c40e9a8cc4 100644 (file)
--- a/gtk2_ardour/tempo_dialog.h
+++ b/gtk2_ardour/tempo_dialog.h
@@ -47,23 +47,31 @@ public:
 
 private:
        void init (const Timecode::BBT_Time& start, double, double, bool);
+       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 note_types_change ();
+       void pulse_change ();
+       bool tap_tempo_button_press (GdkEventButton* );
+       bool tap_tempo_focus_out (GdkEventFocus* );
 
-       Gtk::ComboBoxText note_types;
-       std::vector<std::string> strings;
+       typedef std::map<std::string,float> NoteTypes;
+       NoteTypes note_types;
+
+       bool tapped;      // whether the tap-tempo button has been clicked
+       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
@@ -79,17 +87,20 @@ public:
 
 private:
        void init (const Timecode::BBT_Time&, double, double, bool);
+       bool is_user_input_valid() const;
        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__ */