ardour/livetrax
13
0
Fork 0
Code

improve video-server start-up sequence

Browse Source 
* don't wait if launching the app failed
* lower timeout and check interval
* print warnings..
This commit is contained in:
Robin Gareus 2013-06-09 15:51:31 +02:00
parent 844436d3c6
commit 3942eec0e9
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtk2_ardour/ardour_ui.cc
View File

@ -3428,11 +3428,17 @@ ARDOUR_UI::start_video_server (Gtk::Window* float_window, bool popup_msg)
}
video_server_process = new SystemExec(icsd_exec, argp);
video_server_process->start();
int timeout = 10;
if (video_server_process->start()) {
warning << _("Cannot launch the video-server") << endmsg;
continue;
}
int timeout = 120; // 6 sec
while (!ARDOUR_UI::instance()->video_timeline->check_server()) {
sleep(1);
if (--timeout <= 0) break;
usleep (50000);
if (--timeout <= 0 || !video_server_process->is_running()) break;
}
if (timeout <= 0) {
warning << _("Video-server was started but does not respond to requests...") << endmsg;
}
}
return true;