diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-12-20 16:29:44 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-12-20 16:29:44 +0000 |
| commit | 6227b5d47349ebf1aa3afc30e8a30962417fdf7b (patch) | |
| tree | c4bcc13fe863d259f1bd243ee4da0bfce037a275 /gtk2_ardour/tempo_dialog.h | |
| parent | 7dffe671da3489206f06d57c96595d5eaabb9ec4 (diff) | |
rework tempo dialog to (a) allow selection of pulse note type (b) avoid awful kludge to get note type from the combobox; show pulse note type in tempo markers
git-svn-id: svn://localhost/ardour2/branches/3.0@11027 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/tempo_dialog.h')
| -rw-r--r-- | gtk2_ardour/tempo_dialog.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/gtk2_ardour/tempo_dialog.h b/gtk2_ardour/tempo_dialog.h index b22ef7bc26..cfb09b0476 100644 --- a/gtk2_ardour/tempo_dialog.h +++ b/gtk2_ardour/tempo_dialog.h @@ -51,19 +51,19 @@ private: 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 @@ -89,7 +89,6 @@ private: Gtk::Button ok_button; Gtk::Button cancel_button; Gtk::Entry when_bar_entry; - char buf[64]; }; #endif /* __ardour_gtk_tempo_dialog_h__ */ |