another replacement of ActionManager::get_action() by ActionMap::find_action()

[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 227671aa5697afec3f43e9da9bfced765352992e..9422a53971dfc0485dc3bf62eac4e3bf2f88acb0 100644 (file)
--- 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>
@@ -74,13 +79,10 @@ VideoServerDialog::VideoServerDialog (Session* s)
        HBox* docroot_hbox = manage (new HBox);
 
        path_entry.set_width_chars(38);
-       path_browse_button.set_name ("PaddedButton");
        path_entry.set_text("/usr/bin/harvid");
        docroot_entry.set_width_chars(38);
-       docroot_entry.set_text(Config->get_video_server_docroot());
-       docroot_browse_button.set_name ("PaddedButton");
+       docroot_entry.set_text(video_get_docroot (Config));
 
-       listenaddr_combo.set_name ("PaddedButton");
 #ifndef __APPLE__
        /* Note: on OSX icsd is not able to bind to IPv4 localhost */
        listenaddr_combo.append_text("127.0.0.1");
@@ -104,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 += "/"; }
@@ -151,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);