smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-17 12:16:30 +01:00
Code Issues Projects Releases Wiki Activity

'gtk2_ardour' - Specify 'Glib::usleep' where needed (global ::usleep is not available for MSVC)

Browse source
This commit is contained in:
John Emmas 2013-10-03 09:34:52 +01:00
parent 8bf59e88e5
commit a19afc5903
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gtk2_ardour/ardour_ui.cc
View file

@ -793,14 +793,14 @@ ARDOUR_UI::startup ()
// wait for announce reply from nsm server // wait for announce reply from nsm server
for ( i = 0; i < 5000; ++i) { for ( i = 0; i < 5000; ++i) {
nsm->check (); nsm->check ();
usleep (i); Glib::usleep (i);
if (nsm->is_active()) if (nsm->is_active())
break; break;
} }
// 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); Glib::usleep (1000);
if (nsm->client_id ()) if (nsm->client_id ())
break; break;
} }
@ -3428,7 +3428,7 @@ ARDOUR_UI::start_video_server (Gtk::Window* float_window, bool popup_msg)
} }
int timeout = 120; // 6 sec int timeout = 120; // 6 sec
while (!ARDOUR_UI::instance()->video_timeline->check_server()) { while (!ARDOUR_UI::instance()->video_timeline->check_server()) {
usleep (50000); Glib::usleep (50000);
if (--timeout <= 0 || !video_server_process->is_running()) break; if (--timeout <= 0 || !video_server_process->is_running()) break;
} }
if (timeout <= 0) { if (timeout <= 0) {