smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-06 13:45:43 +01:00
Code Issues Projects Releases Wiki Activity

Tweak websocket surface for use src-tree shared dir

Browse source 
When running from the src-tree, ardev_common.sh sets multiple
data-paths, to allow running ./ardev ./gtk2_ardour/ardev.
Pick the first one that contains a "web_surfaces" subfolder as
docroot.
This commit is contained in:
Robin Gareus 2020-04-09 21:50:01 +02:00
parent 61692ae1f8
commit be023ef32d
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
2 changed files with 9 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

29
libs/surfaces/websockets/resources.cc
View file

@ -116,33 +116,22 @@ ServerResources::server_data_dir ()
std::string env_dir (Glib::getenv (data_dir_env_var, defined));
if (defined) {
// useful for development
/* useful for development */
data_dir = env_dir;
} else {
data_dir = Glib::build_filename (ardour_data_dir (), data_dir_name);
/* use reverse iterator, since ardour_data_search_path() prefixes the user-data dir */
PBD::Searchpath s (ARDOUR::ardour_data_search_path ());
for (PBD::Searchpath::reverse_iterator i = s.rbegin (); i != s.rend(); ++i) {
data_dir = Glib::build_filename (*i, data_dir_name);
if (Glib::file_test(data_dir, Glib::FILE_TEST_EXISTS | Glib::FILE_TEST_IS_DIR)) {
break;
}
}
}
return data_dir;
}
std::string
ServerResources::ardour_data_dir ()
{
std::string data_dir;
#ifdef PLATFORM_WINDOWS
// windows_search_path() returns a Searchpath with a single item
data_dir = ARDOUR::windows_search_path ().to_string ();
#else
data_dir = Glib::getenv ("ARDOUR_DATA_PATH");
if (data_dir.empty()) {
std::cerr << "ARDOUR_CONFIG_PATH not set in environment" << std::endl;
}
#endif
return data_dir;
}
SurfaceManifestVector
ServerResources::read_manifests (std::string dir)
{