X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fengine_dialog.h;h=0d7ce29b469f05071a02d8443a5ec5d4b4856adb;hb=e34470b7bdeefa71c081adbd957829a1c6dbf247;hp=d9741e3765f0116e418ae1d1e9f2a56c608f2c5e;hpb=ac1a2557065726e31a4c9dfaec97b29393e043d8;p=ardour.git

diff --git a/gtk2_ardour/engine_dialog.h b/gtk2_ardour/engine_dialog.h
index d9741e3765..0d7ce29b46 100644
--- a/gtk2_ardour/engine_dialog.h
+++ b/gtk2_ardour/engine_dialog.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2010 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 __gtk2_ardour_engine_dialog_h__
 #define __gtk2_ardour_engine_dialog_h__
 
@@ -20,7 +39,7 @@ class EngineControl : public Gtk::VBox {
 	EngineControl ();
 	~EngineControl ();
 
-	static bool engine_running ();
+	static bool need_setup ();
 	int setup_engine ();
 
 	bool was_used() const { return _used; }
@@ -30,13 +49,11 @@ class EngineControl : public Gtk::VBox {
   private:
 	Gtk::Adjustment periods_adjustment;
 	Gtk::SpinButton periods_spinner;
-	Gtk::Adjustment priority_adjustment;
-	Gtk::SpinButton priority_spinner;
 	Gtk::Adjustment ports_adjustment;
 	Gtk::SpinButton ports_spinner;
-	Gtk::SpinButton input_channels;
-	Gtk::SpinButton output_channels;
+	Gtk::Adjustment input_latency_adjustment;
 	Gtk::SpinButton input_latency;
+	Gtk::Adjustment output_latency_adjustment;
 	Gtk::SpinButton output_latency;
 	Gtk::Label latency_label;
 
@@ -49,7 +66,7 @@ class EngineControl : public Gtk::VBox {
 	Gtk::CheckButton hw_monitor_button;
 	Gtk::CheckButton hw_meter_button;
 	Gtk::CheckButton verbose_output_button;
-	
+
 	Gtk::Button start_button;
 	Gtk::Button stop_button;
 	Gtk::HButtonBox button_box;
@@ -66,6 +83,7 @@ class EngineControl : public Gtk::VBox {
 	Gtk::ComboBoxText audio_mode_combo;
 	Gtk::ComboBoxText input_device_combo;
 	Gtk::ComboBoxText output_device_combo;
+	Gtk::ComboBoxText midi_driver_combo;
 
 	Gtk::Table basic_packer;
 	Gtk::Table options_packer;
@@ -74,16 +92,17 @@ class EngineControl : public Gtk::VBox {
 	Gtk::HBox options_hbox;
 	Gtk::HBox device_hbox;
 	Gtk::Notebook notebook;
-	
+
 	bool _used;
 
-	void realtime_changed ();
+        static bool engine_running ();
+
 	void driver_changed ();
 	void build_command_line (std::vector<std::string>&);
 
 	std::map<std::string,std::vector<std::string> > devices;
 	std::vector<std::string> backend_devs;
-	void enumerate_devices (const string& driver);
+	void enumerate_devices (const std::string& driver);
 
 #ifdef __APPLE__
 	std::vector<std::string> enumerate_coreaudio_devices ();
@@ -94,7 +113,7 @@ class EngineControl : public Gtk::VBox {
 	std::vector<std::string> enumerate_freebob_devices ();
 	std::vector<std::string> enumerate_ffado_devices ();
 	std::vector<std::string> enumerate_dummy_devices ();
-#endif	
+#endif
 
 	void redisplay_latency ();
 	uint32_t get_rate();