Remove all use of nframes_t.

[ardour.git] / gtk2_ardour / tempo_dialog.h

diff --git a/gtk2_ardour/tempo_dialog.h b/gtk2_ardour/tempo_dialog.h
index c75f60ac23c5227833261f575d403d6fbe931dad..ebb700e3e97bca23b4ae8f53bf8d89725d2ce501 100644 (file)
--- a/gtk2_ardour/tempo_dialog.h
+++ b/gtk2_ardour/tempo_dialog.h
@@ -35,21 +35,10 @@
 
 #include "ardour_dialog.h"
 
-struct TempoDialog : public ArdourDialog
+class TempoDialog : public ArdourDialog
 {
-       Gtk::ComboBoxText note_types;
-       std::vector<std::string> 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];
-
-       TempoDialog (ARDOUR::TempoMap&, nframes_t, const std::string & action);
+public:
+       TempoDialog (ARDOUR::TempoMap&, framepos_t, const std::string & action);
        TempoDialog (ARDOUR::TempoSection&, const std::string & action);
 
        double get_bpm ();
@@ -63,19 +52,25 @@ 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<std::string> 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];
+};
 
-       MeterDialog (ARDOUR::TempoMap&, nframes_t, const std::string & action);
+class MeterDialog : public ArdourDialog
+{
+public:
+       
+       MeterDialog (ARDOUR::TempoMap&, framepos_t, const std::string & action);
        MeterDialog (ARDOUR::MeterSection&, const std::string & action);
 
        double get_bpb ();
@@ -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<std::string> strings;
+       Gtk::Button  ok_button;
+       Gtk::Button  cancel_button;
+       Gtk::Entry   when_bar_entry;
+       char buf[64];
 };
 
 #endif /* __ardour_gtk_tempo_dialog_h__ */