X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftempo_dialog.h;h=c1a88367ca2c1a76ed94997296c4042466edf8b8;hb=5b520324ceab2559723b4ef5127301fa61ff4846;hp=720a87c4ba6fd4f11b1ec6fd9cc2d224468e4c47;hpb=93c7aeba048f19df5abee5e4325ef8b0ef62c279;p=ardour.git

diff --git a/gtk2_ardour/tempo_dialog.h b/gtk2_ardour/tempo_dialog.h
index 720a87c4ba..c1a88367ca 100644
--- a/gtk2_ardour/tempo_dialog.h
+++ b/gtk2_ardour/tempo_dialog.h
@@ -1,3 +1,22 @@
+/*
+    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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __ardour_gtk_tempo_dialog_h__
 #define __ardour_gtk_tempo_dialog_h__
 
@@ -8,76 +27,69 @@
 #include <gtkmm/label.h>
 #include <gtkmm/table.h>
 #include <gtkmm/entry.h>
+#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::Entry   bpm_entry;
-    Gtk::Frame   bpm_frame;
-    Gtk::VBox    vpacker;
-    Gtk::Button  ok_button;
-    Gtk::Button  cancel_button;
-    Gtk::HBox    button_box;
-    Gtk::HBox    hspacer1;
-    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);
-
-    double get_bpm ();
-    bool   get_bbt_time (ARDOUR::BBT_Time&);
-    
-  private:
-    void init (const ARDOUR::BBT_Time& start, double, bool);
-    bool bpm_key_press (GdkEventKey* );
-    bool bpm_key_release (GdkEventKey* );
+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 ();
+	bool bpm_button_press (GdkEventButton* );
+	bool bpm_button_release (GdkEventButton* );
+	bool entry_key_release (GdkEventKey* );
+	void note_types_change ();
+
+	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];
 };
 
-struct MeterDialog : public ArdourDialog 
+class 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];
-    
-    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&);
-
-  private:
-    void init (const ARDOUR::BBT_Time&, double, double, bool);
-    bool bpb_key_press (GdkEventKey* );
-    bool bpb_key_release (GdkEventKey* );
-    void note_types_change ();
+public:
+	
+	MeterDialog (ARDOUR::TempoMap&, nframes_t, const std::string & action);
+	MeterDialog (ARDOUR::MeterSection&, const std::string & action);
+
+	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 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__ */