From 7bdcc1feff72a16a072e0f7f8eb0df2d7e4908d8 Mon Sep 17 00:00:00 2001 From: Valeriy Kamyshniy Date: Tue, 27 May 2014 21:31:34 -0400 Subject: [PATCH] [P4/git history rebuild] modifications related to work on automatic reconnection logic when i/o model is changed --- gtk2_ardour/session_dialog.cc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gtk2_ardour/session_dialog.cc b/gtk2_ardour/session_dialog.cc index 996dab1cc4..3d1bf2f212 100644 --- a/gtk2_ardour/session_dialog.cc +++ b/gtk2_ardour/session_dialog.cc @@ -44,7 +44,7 @@ #include "ardour_ui.h" #include "session_dialog.h" #include "opts.h" -#include "engine_dialog.h" +//VKPRefs:#include "engine_dialog.h" #include "i18n.h" #include "utils.h" @@ -78,9 +78,9 @@ SessionDialog::SessionDialog (bool require_new, const std::string& session_name, set_position (WIN_POS_CENTER); get_vbox()->set_spacing (6); - cancel_button = add_button ((cancel_not_quit ? Stock::CANCEL : Stock::QUIT), RESPONSE_CANCEL); - back_button = add_button (Stock::GO_BACK, RESPONSE_NO); - open_button = add_button (Stock::OPEN, RESPONSE_ACCEPT); + cancel_button = add_button ((cancel_not_quit ? "CANCEL" : "QUIT"), RESPONSE_CANCEL); + back_button = add_button ("BACK", RESPONSE_NO); + open_button = add_button ("OPEN", RESPONSE_ACCEPT); back_button->signal_button_press_event().connect (sigc::mem_fun (*this, &SessionDialog::back_button_pressed), false); @@ -1022,6 +1022,9 @@ SessionDialog::master_bus_button_clicked () _master_bus_channel_count.set_sensitive(yn); _connect_outputs_to_master.set_sensitive(yn); + // GZ: activate correct connection type + _connect_outputs_to_master.set_active(yn); + _connect_outputs_to_physical.set_active(!yn); } void