ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

vtl: prepare simple/advanced usage modes 

"simple": localhost only system; hide much of the setup complexity
"advanced":' allow for remote-server, paths mapping, server index etc.
This commit is contained in:
Robin Gareus 2013-03-27 22:27:26 +01:00
parent 4abbabdcf9
commit c97244aaa9
3 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gtk2_ardour/utils_videotl.cc
View File

@ -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"
@ -93,6 +93,25 @@ video_dest_dir (const std::string sessiondir, const std::string docroot)
return dir;
}
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)
{

3
gtk2_ardour/utils_videotl.h
View File

@ -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,

3
libs/ardour/ardour/rc_configuration_vars.h
View File

@ -217,9 +217,10 @@ CONFIG_VARIABLE (std::string, updates_url, "updates-url", "http://ardour.org/wha
CONFIG_VARIABLE (std::string, donate_url, "donate-url", "http://ardour.org/donate")
#ifdef WITH_VIDEOTIMELINE
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_docroot, "video-server-docroot", "/")
CONFIG_VARIABLE (bool, video_monitor_setup_dialog, "video-monitor-setup-dialog", false)
CONFIG_VARIABLE (bool, show_video_export_info, "show-video-export-info", true)
CONFIG_VARIABLE (bool, show_video_server_dialog, "show-video-server-dialog", true)
CONFIG_VARIABLE (bool, show_video_server_dialog, "show-video-server-dialog", false)
#endif