X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fengine_dialog.h;h=142e1fea18d0ae7ae4f5963401883963a2221ce3;hb=52275254a7adb9a446c104cc7dcfde82d1792786;hp=6a90d3b055cb34946b0bfaa11e3561ea516da659;hpb=8357775fbbd3d6b9a60356639596f2a224dff12e;p=ardour.git

diff --git a/gtk2_ardour/engine_dialog.h b/gtk2_ardour/engine_dialog.h
index 6a90d3b055..142e1fea18 100644
--- a/gtk2_ardour/engine_dialog.h
+++ b/gtk2_ardour/engine_dialog.h
@@ -109,9 +109,6 @@ class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList {
     bool              have_lm_results;
     bool              lm_running;
 
-    Gtk::Button* cancel_button;
-    Gtk::Button* ok_button;
-
     /* MIDI Tab */
 
     Gtk::VBox midi_vbox;
@@ -137,6 +134,7 @@ class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList {
     void midi_option_changed ();
 
     void setup_midi_tab_for_backend ();
+    void setup_midi_tab_for_jack ();
     void refresh_midi_display (std::string focus = "");
 
 	void update_midi_options ();
@@ -306,7 +304,7 @@ class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList {
 	sigc::connection output_channels_connection;
 
     void on_show ();
-    void on_response (int);
+    void on_map ();
     void control_app_button_clicked ();
     void start_stop_button_clicked ();
     void update_devices_button_clicked ();
@@ -349,44 +347,6 @@ class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList {
     void midi_latency_adjustment_changed(Gtk::Adjustment *, MidiDeviceSettings, bool);
     void midi_device_enabled_toggled(ArdourButton *, MidiDeviceSettings);
     sigc::connection lm_back_button_signal;
-
-	/* MIDI port management */
-	struct MidiPortColumns : public Gtk::TreeModel::ColumnRecord {
-
-		MidiPortColumns () {
-			add (name);
-			add (pretty_name);
-			add (in_use);
-			add (music_data);
-			add (control_data);
-			add (selection);
-			add (port);
-		}
-
-		Gtk::TreeModelColumn<std::string> name;
-		Gtk::TreeModelColumn<std::string> pretty_name;
-		Gtk::TreeModelColumn<bool> in_use;
-		Gtk::TreeModelColumn<bool> music_data;
-		Gtk::TreeModelColumn<bool> control_data;
-		Gtk::TreeModelColumn<bool> selection;
-		Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Port> > port;
-	};
-
-	MidiPortColumns midi_port_columns;
-	Gtk::TreeView midi_input_view;
-	Gtk::TreeView midi_output_view;
-	int pretty_name_column;
-	int use_column;
-	int music_column;
-	int control_column;
-	int selection_column;
-
-	void refill_midi_ports (bool for_input);
-	void pretty_name_edit (std::string const & path, std::string const & new_text, Gtk::TreeView*);
-	void midi_use_column_toggled (std::string const & path, Gtk::TreeView*);
-	void midi_music_column_toggled (std::string const & path, Gtk::TreeView*);
-	void midi_control_column_toggled (std::string const & path, Gtk::TreeView*);
-	void midi_selection_column_toggled (std::string const & path, Gtk::TreeView*);
 };
 
 #endif /* __gtk2_ardour_engine_dialog_h__ */