X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Ftempo_dialog.h;h=c1a88367ca2c1a76ed94997296c4042466edf8b8;hb=5b520324ceab2559723b4ef5127301fa61ff4846;hp=cbb237abb87a5296f5c965fb7897e88a4f4a73d3;hpb=8fed7470f5fb37ebd007410f4095851ba29ad2b4;p=ardour.git

diff --git a/gtk2_ardour/tempo_dialog.h b/gtk2_ardour/tempo_dialog.h
index cbb237abb8..c1a88367ca 100644
--- a/gtk2_ardour/tempo_dialog.h
+++ b/gtk2_ardour/tempo_dialog.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2007 Paul Davis 
+    Copyright (C) 2000-2007 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -30,37 +30,21 @@
 #include <gtkmm/spinbutton.h>
 #include <gtkmm/comboboxtext.h>
 
-#include <ardour/types.h>
-#include <ardour/tempo.h>
+#include "ardour/types.h"
+#include "ardour/tempo.h"
 
 #include "ardour_dialog.h"
 
-struct TempoDialog : public ArdourDialog 
+class TempoDialog : public ArdourDialog
 {
-	Gtk::ComboBoxText note_types;
-	vector<string> strings;
-	Gtk::Adjustment   bpm_adjustment;
-	Gtk::SpinButton   bpm_spinner;
-	Gtk::Frame        bpm_frame;
-	Gtk::Button  ok_button;
-	Gtk::Button  cancel_button;
-	Gtk::HBox    hspacer1, hspacer2;
-	Gtk::VBox    vspacer1;
-	Gtk::Entry   when_bar_entry;
-	Gtk::Entry   when_beat_entry;
-	Gtk::Label   when_bar_label;
-	Gtk::Label   when_beat_label;
-	Gtk::Table   when_table;
-	Gtk::Frame   when_frame;
-	char buf[64];
-    
-	TempoDialog (ARDOUR::TempoMap&, nframes_t, const string & action);
-	TempoDialog (ARDOUR::TempoSection&, const string & action);
+public:
+	TempoDialog (ARDOUR::TempoMap&, nframes_t, const std::string & action);
+	TempoDialog (ARDOUR::TempoSection&, const std::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, double, bool);
 	void bpm_changed ();
@@ -68,22 +52,26 @@ 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;
-	vector<string> strings;
-	Gtk::Frame   bpb_frame;
+	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::Frame   when_frame;
+	Gtk::Entry   when_beat_entry;
+	Gtk::Label   when_bar_label;
+	Gtk::Label   when_beat_label;
 	char buf[64];
-    
-	MeterDialog (ARDOUR::TempoMap&, nframes_t, const string & action);
-	MeterDialog (ARDOUR::MeterSection&, const string & action);
+};
+
+class MeterDialog : public ArdourDialog
+{
+public:
+	
+	MeterDialog (ARDOUR::TempoMap&, nframes_t, const std::string & action);
+	MeterDialog (ARDOUR::MeterSection&, const std::string & action);
 
 	double get_bpb ();
 	double get_note_type ();
@@ -94,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__ */