Tempo ramps - api rename, fix various meter and tempo dialog bugs.

[ardour.git] / gtk2_ardour / tempo_dialog.h

diff --git a/gtk2_ardour/tempo_dialog.h b/gtk2_ardour/tempo_dialog.h
index 616be2433e3cf4c0d4cf49dc6ae19c02d6bf0c69..c6828e3ad255517270f586ee09f09d6c475e0103 100644 (file)
--- a/gtk2_ardour/tempo_dialog.h
+++ b/gtk2_ardour/tempo_dialog.h
@@ -39,26 +39,36 @@ class TempoDialog : public ArdourDialog
 {
 public:
        TempoDialog (ARDOUR::TempoMap&, framepos_t, const std::string & action);
-       TempoDialog (ARDOUR::TempoSection&, const std::string & action);
+       TempoDialog (ARDOUR::TempoMap&, ARDOUR::TempoSection&, const std::string & action);
 
        double get_bpm ();
        double get_note_type ();
        bool   get_bbt_time (Timecode::BBT_Time&);
+       ARDOUR::TempoSection::Type get_tempo_type ();
 
 private:
-       void init (const Timecode::BBT_Time& start, double, double, bool);
+       void init (const Timecode::BBT_Time& start, double bpm , double note_type, ARDOUR::TempoSection::Type type, bool movable);
+       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 ();
-       void tap_tempo ();
+       void tempo_type_change ();
+       bool tap_tempo_button_press (GdkEventButton* );
+       bool tap_tempo_focus_out (GdkEventFocus* );
 
        typedef std::map<std::string,float> NoteTypes;
        NoteTypes note_types;
 
-       gint64 last_tap;
-       double average_interval;
+       typedef std::map<std::string, ARDOUR::TempoSection::Type> TempoTypes;
+       TempoTypes tempo_types;
+
+       bool tapped;      // whether the tap-tempo button has been clicked
+       double sum_x, sum_xx, sum_xy, sum_y;
+       double tap_count;
+       double last_t;
+       gint64 first_t;
 
        Gtk::ComboBoxText pulse_selector;
        Gtk::Adjustment   bpm_adjustment;
@@ -69,6 +79,8 @@ private:
        Gtk::Label   when_beat_label;
        Gtk::Label   pulse_selector_label;
        Gtk::Button  tap_tempo_button;
+       Gtk::ComboBoxText tempo_type;
+
 };
 
 class MeterDialog : public ArdourDialog
@@ -76,7 +88,7 @@ class MeterDialog : public ArdourDialog
 public:
 
        MeterDialog (ARDOUR::TempoMap&, framepos_t, const std::string & action);
-       MeterDialog (ARDOUR::MeterSection&, const std::string & action);
+       MeterDialog (ARDOUR::TempoMap&, ARDOUR::MeterSection&, const std::string & action);
 
        double get_bpb ();
        double get_note_type ();
@@ -84,6 +96,7 @@ 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_type_change ();