X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftempo_dialog.h;h=c1a88367ca2c1a76ed94997296c4042466edf8b8;hb=9c4f5ac000ad91b55e4cf91317b7a89f6239870e;hp=c75f60ac23c5227833261f575d403d6fbe931dad;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git diff --git a/gtk2_ardour/tempo_dialog.h b/gtk2_ardour/tempo_dialog.h index c75f60ac23..c1a88367ca 100644 --- a/gtk2_ardour/tempo_dialog.h +++ b/gtk2_ardour/tempo_dialog.h @@ -35,20 +35,9 @@ #include "ardour_dialog.h" -struct TempoDialog : public ArdourDialog +class TempoDialog : public ArdourDialog { - Gtk::ComboBoxText note_types; - std::vector strings; - 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]; - +public: TempoDialog (ARDOUR::TempoMap&, nframes_t, const std::string & action); TempoDialog (ARDOUR::TempoSection&, const std::string & action); @@ -63,18 +52,24 @@ private: bool bpm_button_release (GdkEventButton* ); bool entry_key_release (GdkEventKey* ); void note_types_change (); -}; -struct MeterDialog : public ArdourDialog -{ - Gtk::Entry bpb_entry; Gtk::ComboBoxText note_types; std::vector strings; + 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]; +}; +class MeterDialog : public ArdourDialog +{ +public: + MeterDialog (ARDOUR::TempoMap&, nframes_t, const std::string & action); MeterDialog (ARDOUR::MeterSection&, const std::string & action); @@ -87,6 +82,14 @@ private: bool entry_key_press (GdkEventKey* ); bool entry_key_release (GdkEventKey* ); void note_types_change (); + + Gtk::Entry bpb_entry; + Gtk::ComboBoxText note_types; + std::vector strings; + Gtk::Button ok_button; + Gtk::Button cancel_button; + Gtk::Entry when_bar_entry; + char buf[64]; }; #endif /* __ardour_gtk_tempo_dialog_h__ */