{
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 ();
+ 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 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 ();
- void tap_tempo ();
+ void tempo_type_change ();
+ void lock_style_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;
+
+ typedef std::map<std::string, ARDOUR::PositionLockStyle> LockStyles;
+ LockStyles lock_styles;
+
+ 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;
+
+ ARDOUR::TempoMap* _map;
+ ARDOUR::TempoSection* _section;
Gtk::ComboBoxText pulse_selector;
Gtk::Adjustment bpm_adjustment;
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&, 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;