diff options
| author | Robin Gareus <robin@gareus.org> | 2013-06-13 00:55:04 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2013-06-13 00:58:19 +0200 |
| commit | 27e2b09f632d7a2cb08fe338248800fd97cb3c06 (patch) | |
| tree | f135c7848bf2fd4d44311829bb11594f39a49364 /gtk2_ardour/ardour_ui.cc | |
| parent | 6b480bb2f7d16288b5fa0d35f827ad32f88a6978 (diff) | |
vtl: check if server's docroot matches ardour's config
NOTE: this breaks backwards compatibility with icsd and
harvid < 0.3.0 which do not report their settings.
It may also conflict with harvid running on localhost in a chroot.
Ideally this will be a warning only.
That the user can choose to ignore this and should get the option
to stop the video-server and re-start it using a different docroot.
Diffstat (limited to 'gtk2_ardour/ardour_ui.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index a7034a1677..346fcc3c63 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -3439,6 +3439,11 @@ ARDOUR_UI::start_video_server (Gtk::Window* float_window, bool popup_msg) } if (timeout <= 0) { warning << _("Video-server was started but does not respond to requests...") << endmsg; + } else { + if (!ARDOUR_UI::instance()->video_timeline->check_server_docroot()) { + delete video_server_process; + video_server_process = 0; + } } } return true; |