diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-12-21 14:48:25 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-12-21 14:48:25 +0000 |
| commit | 2315c433e276110d8c1ac7cc5c8935c31b6f5879 (patch) | |
| tree | e588fa9f1be957f6e9995c142b94911718378ff9 /gtk2_ardour/tempo_dialog.h | |
| parent | 1fca71fd283c912bbb0d88fcb95fb8e3b330c09e (diff) | |
new tempo handling from drmoore; don't follow playhead when doing requested_return stuff; if selected marker is end of range, do the right thing when computing edit point
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2806 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/tempo_dialog.h')
| -rw-r--r-- | gtk2_ardour/tempo_dialog.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/gtk2_ardour/tempo_dialog.h b/gtk2_ardour/tempo_dialog.h index b9f6a16b24..a92f26f8e3 100644 --- a/gtk2_ardour/tempo_dialog.h +++ b/gtk2_ardour/tempo_dialog.h @@ -37,6 +37,9 @@ struct TempoDialog : public ArdourDialog { + Gtk::ComboBoxText note_types; + vector<string> strings; + Gtk::Frame note_frame; Gtk::Adjustment bpm_adjustment; Gtk::SpinButton bpm_spinner; Gtk::Frame bpm_frame; @@ -44,8 +47,8 @@ struct TempoDialog : public ArdourDialog Gtk::Button ok_button; Gtk::Button cancel_button; Gtk::HBox button_box; - Gtk::HBox hspacer1; - Gtk::VBox vspacer1; + Gtk::HBox hspacer1, hspacer2; + Gtk::VBox vspacer1, vspacer2; Gtk::Entry when_bar_entry; Gtk::Entry when_beat_entry; Gtk::Label when_bar_label; @@ -58,13 +61,15 @@ struct TempoDialog : public ArdourDialog TempoDialog (ARDOUR::TempoSection&, const string & action); double get_bpm (); + double get_note_type (); bool get_bbt_time (ARDOUR::BBT_Time&); private: - void init (const ARDOUR::BBT_Time& start, double, bool); + void init (const ARDOUR::BBT_Time& start, double, double, bool); void bpm_changed (); bool bpm_button_press (GdkEventButton* ); bool bpm_button_release (GdkEventButton* ); + void note_types_change (); }; struct MeterDialog : public ArdourDialog |