Merge branch 'nsm' of https://github.com/royvegard/ardour
This commit is contained in:
commit
ec6dd2dc8b
@ -667,16 +667,21 @@ ARDOUR_UI::startup ()
|
|||||||
if (!nsm->init (nsm_url)) {
|
if (!nsm->init (nsm_url)) {
|
||||||
nsm->announce (PROGRAM_NAME, ":dirty:", "ardour3");
|
nsm->announce (PROGRAM_NAME, ":dirty:", "ardour3");
|
||||||
|
|
||||||
|
unsigned int i = 0;
|
||||||
// wait for announce reply from nsm server
|
// wait for announce reply from nsm server
|
||||||
do {
|
for ( i = 0; i < 5000; ++i) {
|
||||||
nsm->check ();
|
nsm->check ();
|
||||||
usleep (10);
|
usleep (i);
|
||||||
} while (!nsm->is_active ());
|
if (nsm->is_active())
|
||||||
|
break;
|
||||||
|
}
|
||||||
// wait for open command from nsm server
|
// wait for open command from nsm server
|
||||||
do {
|
for ( i = 0; i < 5000; ++i) {
|
||||||
nsm->check ();
|
nsm->check ();
|
||||||
usleep (10);
|
usleep (1000);
|
||||||
} while (!nsm->client_id ());
|
if (nsm->client_id ())
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
if (_session && nsm) {
|
if (_session && nsm) {
|
||||||
_session->set_nsm_state( nsm->is_active() );
|
_session->set_nsm_state( nsm->is_active() );
|
||||||
@ -699,12 +704,6 @@ ARDOUR_UI::startup ()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// wait for session is loaded reply from nsm server
|
|
||||||
do {
|
|
||||||
nsm->check ();
|
|
||||||
usleep (10);
|
|
||||||
} while (!nsm->session_loaded ());
|
|
||||||
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
delete nsm;
|
delete nsm;
|
||||||
@ -982,7 +981,7 @@ ARDOUR_UI::every_second ()
|
|||||||
update_disk_space ();
|
update_disk_space ();
|
||||||
update_timecode_format ();
|
update_timecode_format ();
|
||||||
|
|
||||||
if (nsm && nsm->is_active () && nsm->session_loaded ()) {
|
if (nsm && nsm->is_active ()) {
|
||||||
nsm->check ();
|
nsm->check ();
|
||||||
|
|
||||||
if (!_was_dirty && _session->dirty ()) {
|
if (!_was_dirty && _session->dirty ()) {
|
||||||
|
@ -28,7 +28,6 @@
|
|||||||
|
|
||||||
NSM_Client::NSM_Client()
|
NSM_Client::NSM_Client()
|
||||||
{
|
{
|
||||||
_session_loaded = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
@ -59,9 +58,3 @@ NSM_Client::command_open(const char *name,
|
|||||||
}
|
}
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
NSM_Client::command_session_is_loaded ( void )
|
|
||||||
{
|
|
||||||
_session_loaded = true;
|
|
||||||
}
|
|
||||||
|
@ -28,17 +28,12 @@ class NSM_Client:public NSM::Client
|
|||||||
NSM_Client();
|
NSM_Client();
|
||||||
~NSM_Client() { }
|
~NSM_Client() { }
|
||||||
|
|
||||||
bool session_loaded(void) { return _session_loaded; }
|
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|
||||||
bool _session_loaded;
|
|
||||||
|
|
||||||
int command_open(const char *name,
|
int command_open(const char *name,
|
||||||
const char *display_name,
|
const char *display_name,
|
||||||
const char *client_id,
|
const char *client_id,
|
||||||
char **out_msg);
|
char **out_msg);
|
||||||
int command_save(char **out_msg);
|
int command_save(char **out_msg);
|
||||||
void command_session_is_loaded (void);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user