From 86106bcfa1fbb39863985ea48252d4ab64890a6a Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 18 Oct 2016 21:18:32 -0400 Subject: [PATCH] set up MIDI port treeview columns *just once* --- gtk2_ardour/engine_dialog.cc | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc index ceece75dc4..145b6812ec 100644 --- a/gtk2_ardour/engine_dialog.cc +++ b/gtk2_ardour/engine_dialog.cc @@ -239,6 +239,21 @@ EngineControl::EngineControl () midi_back_button.signal_clicked().connect (sigc::bind (sigc::mem_fun (notebook, &Gtk::Notebook::set_current_page), 0)); + pretty_name_column = midi_input_view.append_column (_("Pretty Name"), midi_port_columns.pretty_name) - 1; + use_column = midi_input_view.append_column (_("Use"), midi_port_columns.in_use) - 1; + music_column = midi_input_view.append_column (_("Use for Music"), midi_port_columns.music_data) - 1; + control_column = midi_input_view.append_column (_("Use for Control"), midi_port_columns.control_data) - 1; + selection_column = midi_input_view.append_column (_("Follow Selection"), midi_port_columns.control_data) - 1; + + midi_output_view.append_column (_("Pretty Name"), midi_port_columns.pretty_name); + midi_output_view.append_column (_("Use"), midi_port_columns.in_use); + midi_output_view.append_column (_("Use for Music"), midi_port_columns.music_data); + midi_output_view.append_column (_("Use for Control"), midi_port_columns.control_data); + midi_output_view.append_column (_("Follow Selection"), midi_port_columns.control_data); + + midi_input_view.get_selection()->set_mode (SELECTION_NONE); + midi_output_view.get_selection()->set_mode (SELECTION_NONE); + /* pack it all up */ notebook.pages().push_back (TabElem (basic_vbox, _("Audio"))); @@ -783,26 +798,10 @@ EngineControl::setup_midi_tab_for_backend () midi_device_table.set_border_width (12); midi_vbox.pack_start (midi_device_table, true, true); - - pretty_name_column = midi_input_view.append_column (_("Pretty Name"), midi_port_columns.pretty_name) - 1; - use_column = midi_input_view.append_column (_("Use"), midi_port_columns.in_use) - 1; - music_column = midi_input_view.append_column (_("Use for Music"), midi_port_columns.music_data) - 1; - control_column = midi_input_view.append_column (_("Use for Control"), midi_port_columns.control_data) - 1; - selection_column = midi_input_view.append_column (_("Follow Selection"), midi_port_columns.control_data) - 1; - - midi_output_view.append_column (_("Pretty Name"), midi_port_columns.pretty_name); - midi_output_view.append_column (_("Use"), midi_port_columns.in_use); - midi_output_view.append_column (_("Use for Music"), midi_port_columns.music_data); - midi_output_view.append_column (_("Use for Control"), midi_port_columns.control_data); - midi_output_view.append_column (_("Follow Selection"), midi_port_columns.control_data); - - midi_input_view.get_selection()->set_mode (SELECTION_NONE); - midi_output_view.get_selection()->set_mode (SELECTION_NONE); - midi_vbox.pack_start (midi_input_view); midi_vbox.pack_start (midi_output_view); - midi_vbox.pack_start (midi_back_button, false, false); + midi_vbox.show_all (); } -- 2.30.2