diff options
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 10 | ||||
| -rw-r--r-- | gtk2_ardour/utils_videotl.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/video_server_dialog.cc | 4 | ||||
| -rw-r--r-- | libs/ardour/ardour/rc_configuration_vars.h | 4 |
4 files changed, 20 insertions, 2 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index b3298be777..51f2858bea 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -3653,7 +3653,13 @@ ARDOUR_UI::start_video_server (Gtk::Window* float_window, bool popup_msg) std::string icsd_exec = video_server_dialog->get_exec_path(); std::string icsd_docroot = video_server_dialog->get_docroot(); - if (icsd_docroot.empty()) {icsd_docroot = X_("/");} + if (icsd_docroot.empty()) { +#ifndef PLATFORM_WINDOWS + icsd_docroot = X_("/"); +#else + icsd_docroot = X_("C:\\"); +#endif + } GStatBuf sb; if (g_lstat (icsd_docroot.c_str(), &sb) != 0 || !S_ISDIR(sb.st_mode)) { @@ -3687,7 +3693,7 @@ ARDOUR_UI::start_video_server (Gtk::Window* float_window, bool popup_msg) argp[8] = 0; stop_video_server(); - if (icsd_docroot == X_("/")) { + if (icsd_docroot == X_("/") || icsd_docroot == X_("C:\\")) { Config->set_video_advanced_setup(false); } else { std::ostringstream osstream; diff --git a/gtk2_ardour/utils_videotl.cc b/gtk2_ardour/utils_videotl.cc index 24a27c1425..876fb66fe8 100644 --- a/gtk2_ardour/utils_videotl.cc +++ b/gtk2_ardour/utils_videotl.cc @@ -105,7 +105,11 @@ VideoUtils::video_get_docroot (ARDOUR::RCConfiguration* config) if (config->get_video_advanced_setup()) { return config->get_video_server_docroot(); } +#ifndef PLATFORM_WINDOWS return X_("/"); +#else + return X_("C:\\"); +#endif } std::string diff --git a/gtk2_ardour/video_server_dialog.cc b/gtk2_ardour/video_server_dialog.cc index af2ff9efde..227671aa56 100644 --- a/gtk2_ardour/video_server_dialog.cc +++ b/gtk2_ardour/video_server_dialog.cc @@ -151,7 +151,11 @@ VideoServerDialog::VideoServerDialog (Session* s) if (Config->get_video_advanced_setup()){ vbox->pack_start (*docroot_hbox, false, false); } else { +#ifndef PLATFORM_WINDOWS docroot_entry.set_text(X_("/")); +#else + docroot_entry.set_text(X_("C:\\")); +#endif listenport_spinner.set_sensitive(false); } vbox->pack_start (*options_box, false, true); diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h index a3c590547c..826175a60b 100644 --- a/libs/ardour/ardour/rc_configuration_vars.h +++ b/libs/ardour/ardour/rc_configuration_vars.h @@ -205,6 +205,10 @@ CONFIG_VARIABLE (std::string, donate_url, "donate-url", "http://ardour.org/donat /* video timeline configuration */ CONFIG_VARIABLE (bool, video_advanced_setup, "video-advanced-setup", false) CONFIG_VARIABLE (std::string, video_server_url, "video-server-url", "http://localhost:1554") +#ifndef PLATFORM_WINDOWS CONFIG_VARIABLE (std::string, video_server_docroot, "video-server-docroot", "/") +#else +CONFIG_VARIABLE (std::string, video_server_docroot, "video-server-docroot", "C:\\") +#endif CONFIG_VARIABLE (bool, show_video_export_info, "show-video-export-info", true) CONFIG_VARIABLE (bool, show_video_server_dialog, "show-video-server-dialog", false) |