ardour/livetrax
13
0
Fork 0
Code

add error checking and return from attempted NSM-based initialization

Browse Source
This commit is contained in:
Paul Davis 2013-10-27 20:32:33 -04:00
parent 17dc72d08e
commit 632f5d5231
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gtk2_ardour/ardour_ui.cc
View File

@ -742,19 +742,33 @@ ARDOUR_UI::starting ()
for ( i = 0; i < 5000; ++i) { for ( i = 0; i < 5000; ++i) {
nsm->check (); nsm->check ();
usleep (i); usleep (i);
if (nsm->is_active()) if (nsm->is_active()) {
break; break;
}
}
if (i == 5000) {
error << _("NSM server did not announce itself") << endmsg;
return -1;
} }
// wait for open command from nsm server // wait for open command from nsm server
for ( i = 0; i < 5000; ++i) { for ( i = 0; i < 5000; ++i) {
nsm->check (); nsm->check ();
usleep (1000); usleep (1000);
if (nsm->client_id ()) if (nsm->client_id ()) {
break; break;
}
}
if (i == 5000) {
error << _("NSM: no client ID provided") << endmsg;
return -1;
} }
if (_session && nsm) { if (_session && nsm) {
_session->set_nsm_state( nsm->is_active() ); _session->set_nsm_state( nsm->is_active() );
} else {
error << _("NSM: no session created") << endmsg;
return -1;
} }
// nsm requires these actions disabled // nsm requires these actions disabled
@ -773,10 +787,11 @@ ARDOUR_UI::starting ()
} }
} }
} } else {
else {
delete nsm; delete nsm;
nsm = 0; nsm = 0;
error << _("NSM: initialization failed") << endmsg;
return -1;
} }
} else { } else {