diff options
| author | Robin Gareus <robin@gareus.org> | 2017-01-11 03:55:04 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2017-01-11 03:55:04 +0100 |
| commit | d1e7a5bd1cff938caf2bef27685a8e839aa83ee7 (patch) | |
| tree | ebc88271b976ff275c24258bb6c718f51e60ec5d /gtk2_ardour/add_video_dialog.cc | |
| parent | bbd7b2aeea5d8c1a260ce4b43b5c360e793d369a (diff) | |
Windows/Videotimeline: support all drives (no fixed docroot/drive-letter)
Diffstat (limited to 'gtk2_ardour/add_video_dialog.cc')
| -rw-r--r-- | gtk2_ardour/add_video_dialog.cc | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/gtk2_ardour/add_video_dialog.cc b/gtk2_ardour/add_video_dialog.cc index bd94c370ba..98825381e8 100644 --- a/gtk2_ardour/add_video_dialog.cc +++ b/gtk2_ardour/add_video_dialog.cc @@ -193,8 +193,11 @@ AddVideoDialog::AddVideoDialog (Session* s) /* xjadeo checkbox */ if (ARDOUR_UI::instance()->video_timeline->found_xjadeo() +#ifndef PLATFORM_WINDOWS /* TODO xjadeo setup w/ xjremote */ - && video_get_docroot(Config).size() > 0) { + && video_get_docroot(Config).size() > 0 +#endif + ) { xjadeo_checkbox.set_active(true); /* set in ardour_ui.cpp ?! */ } else { printf("xjadeo was not found or video-server docroot is unset (remote video-server)\n"); @@ -323,8 +326,14 @@ AddVideoDialog::file_name (bool &local_file) std::string video_server_url = video_get_server_url(Config); /* check if video server is running locally */ - if (video_get_docroot(Config).size() > 0 && - (0 == video_server_url.compare (0, 16, "http://127.0.0.1") || 0 == video_server_url.compare (0, 16, "http://localhost")) + if ( +#ifdef PLATFORM_WINDOWS + (video_get_docroot(Config).size() > 0 || !show_advanced) +#else + video_get_docroot(Config).size() > 0 +#endif + && + (0 == video_server_url.compare (0, 16, "http://127.0.0.1") || 0 == video_server_url.compare (0, 16, "http://localhost")) ) { /* check if the file can be accessed */ |