Merge with trunk R2978.

git-svn-id: svn://localhost/ardour2/branches/3.0@2988 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 50 insertions, 58 deletions

diff --git a/gtk2_ardour/tempo_dialog.h b/gtk2_ardour/tempo_dialog.h
index 47baa0cd42..c2053644a1 100644
--- a/gtk2_ardour/tempo_dialog.h
+++ b/gtk2_ardour/tempo_dialog.h
@@ -37,74 +37,66 @@
 
 struct TempoDialog : public ArdourDialog 
 {
-    Gtk::ComboBoxText note_types;
-    vector<string> strings;
-    Gtk::Adjustment   bpm_adjustment;
-    Gtk::SpinButton   bpm_spinner;
-    Gtk::Frame        bpm_frame;
-    Gtk::Frame   note_frame;
-    Gtk::VBox    vpacker;
-    Gtk::Button  ok_button;
-    Gtk::Button  cancel_button;
-    Gtk::HBox    button_box;
-    Gtk::HBox    hspacer1, hspacer2;
-    Gtk::VBox    vspacer1, vspacer2;
-    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];
+	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);
+	TempoDialog (ARDOUR::TempoMap&, nframes_t, const string & action);
+	TempoDialog (ARDOUR::TempoSection&, const string & action);
 
-    double get_bpm ();
-    double get_note_type ();
-    bool   get_bbt_time (ARDOUR::BBT_Time&);
+	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 ();
-    bool bpm_button_press (GdkEventButton* );
-    bool bpm_button_release (GdkEventButton* );
-    void note_types_change ();
+private:
+	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 
 {
-    Gtk::Entry   bpb_entry;
-    Gtk::ComboBoxText note_types;
-    vector<string> strings;
-    Gtk::Frame   note_frame;
-    Gtk::Frame   bpb_frame;
-    Gtk::VBox    vpacker;
-    Gtk::Button  ok_button;
-    Gtk::Button  cancel_button;
-    Gtk::HBox    button_box;
-    Gtk::HBox    hspacer1, hspacer2;
-    Gtk::VBox    vspacer1, vspacer2;
-    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];
+	Gtk::Entry   bpb_entry;
+	Gtk::ComboBoxText note_types;
+	vector<string> strings;
+	Gtk::Frame   bpb_frame;
+	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;
+	Gtk::Table   when_table;
+	Gtk::Frame   when_frame;
+	char buf[64];
     
-    MeterDialog (ARDOUR::TempoMap&, nframes_t, const string & action);
-    MeterDialog (ARDOUR::MeterSection&, const string & action);
+	MeterDialog (ARDOUR::TempoMap&, nframes_t, const string & action);
+	MeterDialog (ARDOUR::MeterSection&, const string & action);
 
-    double get_bpb ();
-    double get_note_type ();
-    bool   get_bbt_time (ARDOUR::BBT_Time&);
+	double get_bpb ();
+	double get_note_type ();
+	bool   get_bbt_time (ARDOUR::BBT_Time&);
 
-  private:
-    void init (const ARDOUR::BBT_Time&, double, double, bool);
-    bool bpb_key_press (GdkEventKey* );
-    bool bpb_key_release (GdkEventKey* );
-    void note_types_change ();
+private:
+	void init (const ARDOUR::BBT_Time&, double, double, bool);
+	bool bpb_key_press (GdkEventKey* );
+	bool bpb_key_release (GdkEventKey* );
+	void note_types_change ();
 };
 
 #endif /* __ardour_gtk_tempo_dialog_h__ */