summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/utils_videotl.cc21
-rw-r--r--gtk2_ardour/utils_videotl.h3
2 files changed, 23 insertions, 1 deletions
diff --git a/gtk2_ardour/utils_videotl.cc b/gtk2_ardour/utils_videotl.cc
index adf7d25640..93d5444902 100644
--- a/gtk2_ardour/utils_videotl.cc
+++ b/gtk2_ardour/utils_videotl.cc
@@ -28,8 +28,8 @@
#include "pbd/error.h"
#include "ardour/ardour.h"
#include "ardour/session_directory.h"
-#include "ardour_dialog.h"
#include "video_image_frame.h"
+#include "utils_videotl.h"
#include "i18n.h"
@@ -94,6 +94,25 @@ video_dest_dir (const std::string sessiondir, const std::string docroot)
}
std::string
+video_get_docroot (ARDOUR::RCConfiguration* config)
+{
+ if (config->get_video_advanced_setup()) {
+ return config->get_video_server_docroot();
+ }
+ return X_("/");
+}
+
+std::string
+video_get_server_url (ARDOUR::RCConfiguration* config)
+{
+ if (config->get_video_advanced_setup()) {
+ return config->get_video_server_url();
+ }
+ return X_("http://localhost:1554");
+}
+
+
+std::string
strip_file_extension (const std::string infile)
{
std::string rv;
diff --git a/gtk2_ardour/utils_videotl.h b/gtk2_ardour/utils_videotl.h
index d4633be91a..08ab429e4c 100644
--- a/gtk2_ardour/utils_videotl.h
+++ b/gtk2_ardour/utils_videotl.h
@@ -28,6 +28,7 @@
#include <string>
#include <gtkmm.h>
+#include "ardour/rc_configuration.h"
#include "ardour/types.h"
#include "ardour/template_utils.h"
#include "ardour_dialog.h"
@@ -41,6 +42,8 @@ std::string get_file_extension (const std::string infile);
void ParseCSV(const std::string &csv, std::vector<std::vector<std::string> > &lines);
std::string video_map_path (std::string server_docroot, std::string filepath);
void video_draw_cross (Glib::RefPtr<Gdk::Pixbuf> img);
+std::string video_get_server_url (ARDOUR::RCConfiguration* config);
+std::string video_get_docroot (ARDOUR::RCConfiguration* config);
bool video_query_info (
std::string video_server_url,