mp4chaps Lua script: don't clutter global environment

[ardour.git] / gtk2_ardour / video_server_dialog.cc

diff --git a/gtk2_ardour/video_server_dialog.cc b/gtk2_ardour/video_server_dialog.cc
index 29872fc975b7d2886f20e11ac9218a793199fd1e..beefb53696b792dcf320253dd97cb8f7e32c97c5 100644 (file)
--- a/gtk2_ardour/video_server_dialog.cc
+++ b/gtk2_ardour/video_server_dialog.cc
@@ -22,6 +22,11 @@
 
 #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/session_directory.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);