X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fvideo_server_dialog.cc;h=9422a53971dfc0485dc3bf62eac4e3bf2f88acb0;hb=9ccc56e162554c292b25408246e3680b8f14eea7;hp=2bd814b7ac124a9d31436c7df027beefe0ed5b27;hpb=88d500b28ac2bcab6fd7b6c830a1e6ae84c36b15;p=ardour.git

diff --git a/gtk2_ardour/video_server_dialog.cc b/gtk2_ardour/video_server_dialog.cc
index 2bd814b7ac..9422a53971 100644
--- a/gtk2_ardour/video_server_dialog.cc
+++ b/gtk2_ardour/video_server_dialog.cc
@@ -22,8 +22,14 @@
 
 #include <sigc++/bind.h>
 
+#include <gtkmm/box.h>
+#include <gtkmm/filechooserdialog.h>
+#include <gtkmm/stock.h>
+#include <gtkmm/table.h>
+
 #include "pbd/error.h"
 #include "pbd/file_utils.h"
+#include "ardour/filesystem_paths.h"
 #include "ardour/session_directory.h"
 #include "gtkmm2ext/utils.h"
 #include "ardour/template_utils.h"
@@ -35,8 +41,7 @@
 
 #include "video_server_dialog.h"
 #include "utils_videotl.h"
-#include "video_tool_paths.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #ifdef PLATFORM_WINDOWS
 #include <windows.h>
@@ -76,7 +81,7 @@ VideoServerDialog::VideoServerDialog (Session* s)
 	path_entry.set_width_chars(38);
 	path_entry.set_text("/usr/bin/harvid");
 	docroot_entry.set_width_chars(38);
-	docroot_entry.set_text(Config->get_video_server_docroot());
+	docroot_entry.set_text(video_get_docroot (Config));
 
 #ifndef __APPLE__
 	/* Note: on OSX icsd is not able to bind to IPv4 localhost */
@@ -101,6 +106,11 @@ VideoServerDialog::VideoServerDialog (Session* s)
 			<< endmsg;
 	}
 
+#ifdef PLATFORM_WINDOWS
+	if (VideoUtils::harvid_version >= 0x000802) {
+		/* empty docroot -> all drive letters */
+	} else
+#endif
 	if (docroot_entry.get_text().empty()) {
 	  std::string docroot =  Glib::path_get_dirname(_session->session_directory().root_path());
 	  if ((docroot.empty() || docroot.at(docroot.length()-1) != '/')) { docroot += "/"; }
@@ -148,11 +158,6 @@ 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);