ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

fix up handling of audio/MIDI setup dialog and remove debug output

This commit is contained in:
Paul Davis 2019-10-10 16:51:51 -06:00
parent 3294f193fd
commit 7238c7fdc6
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gtk2_ardour/startup_fsm.cc
View File

@ -114,9 +114,6 @@ void
StartupFSM::dialog_response_handler (int response, StartupFSM::DialogID dialog_id)
{
const bool new_session_required = (ARDOUR_COMMAND_LINE::new_session || (!ARDOUR::Profile->get_mixbus() && new_user));
int csp;
std::cerr << "SFSM state = " << _state << " r = " << response << " did " << dialog_id << " nSR " << new_session_required << std::endl;
switch (_state) {
case NeedSessionPath:
@ -184,10 +181,7 @@ StartupFSM::dialog_response_handler (int response, StartupFSM::DialogID dialog_i
switch (response) {
case RESPONSE_OK:
case RESPONSE_ACCEPT:
PBD::stacktrace (std::cerr, 40);
csp = check_session_parameters (new_session_required);
std::cerr << "csp = " << csp << std::endl;
switch (csp) {
switch (check_session_parameters (new_session_required)) {
case -1:
/* Unrecoverable error */
_signal_response (ExitProgram);
@ -227,16 +221,15 @@ StartupFSM::dialog_response_handler (int response, StartupFSM::DialogID dialog_i
case NeedEngineParams:
switch (dialog_id) {
case AudioMIDISetup:
std::cerr << "AMS done, r = " << response << std::endl;
switch (response) {
case RESPONSE_OK:
case RESPONSE_ACCEPT:
audiomidi_dialog.hide ();
current_dialog_connection.disconnect();
/* fallthru */
case RESPONSE_DELETE_EVENT:
if (AudioEngine::instance()->running()) {
audiomidi_dialog.hide ();
current_dialog_connection.disconnect();
_signal_response (LoadSession);
} else {
/* just keep going */
}
break;
default: