smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 08:14:58 +01:00
Code Issues Projects Releases Wiki Activity

proper default setup and fallbacks for video on windows

Browse source
This commit is contained in:
Robin Gareus 2014-12-24 01:36:46 +01:00
parent f5f89d8c7e
commit bec521c6a7
4 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gtk2_ardour/ardour_ui.cc
View file

@ -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_exec = video_server_dialog->get_exec_path();
std::string icsd_docroot = video_server_dialog->get_docroot(); 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; GStatBuf sb;
if (g_lstat (icsd_docroot.c_str(), &sb) != 0 || !S_ISDIR(sb.st_mode)) { 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; argp[8] = 0;
stop_video_server(); stop_video_server();
if (icsd_docroot == X_("/")) { if (icsd_docroot == X_("/") || icsd_docroot == X_("C:\\")) {
Config->set_video_advanced_setup(false); Config->set_video_advanced_setup(false);
} else { } else {
std::ostringstream osstream; std::ostringstream osstream;

4
gtk2_ardour/utils_videotl.cc
View file

@ -105,7 +105,11 @@ VideoUtils::video_get_docroot (ARDOUR::RCConfiguration* config)
if (config->get_video_advanced_setup()) { if (config->get_video_advanced_setup()) {
return config->get_video_server_docroot(); return config->get_video_server_docroot();
} }
#ifndef PLATFORM_WINDOWS
return X_("/"); return X_("/");
#else
return X_("C:\\");
#endif
} }
std::string std::string

4
gtk2_ardour/video_server_dialog.cc
View file

@ -151,7 +151,11 @@ VideoServerDialog::VideoServerDialog (Session* s)
if (Config->get_video_advanced_setup()){ if (Config->get_video_advanced_setup()){
vbox->pack_start (*docroot_hbox, false, false); vbox->pack_start (*docroot_hbox, false, false);
} else { } else {
#ifndef PLATFORM_WINDOWS
docroot_entry.set_text(X_("/")); docroot_entry.set_text(X_("/"));
#else
docroot_entry.set_text(X_("C:\\"));
#endif
listenport_spinner.set_sensitive(false); listenport_spinner.set_sensitive(false);
} }
vbox->pack_start (*options_box, false, true); vbox->pack_start (*options_box, false, true);

4
libs/ardour/ardour/rc_configuration_vars.h
View file

@ -205,6 +205,10 @@ CONFIG_VARIABLE (std::string, donate_url, "donate-url", "http://ardour.org/donat
/* video timeline configuration */ /* video timeline configuration */
CONFIG_VARIABLE (bool, video_advanced_setup, "video-advanced-setup", false) CONFIG_VARIABLE (bool, video_advanced_setup, "video-advanced-setup", false)
CONFIG_VARIABLE (std::string, video_server_url, "video-server-url", "http://localhost:1554") 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", "/") 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_export_info, "show-video-export-info", true)
CONFIG_VARIABLE (bool, show_video_server_dialog, "show-video-server-dialog", false) CONFIG_VARIABLE (bool, show_video_server_dialog, "show-video-server-dialog", false)