major rationalization of use of search paths. ardour now has just 4 functions used...

[ardour.git] / libs / ardour / filesystem_paths.cc

diff --git a/libs/ardour/filesystem_paths.cc b/libs/ardour/filesystem_paths.cc
index 2d144947645604c65d6afb0f020d3972546307cd..bc84243c842796cb90108c5fb5ae14f20f2a51b1 100644 (file)
--- a/libs/ardour/filesystem_paths.cc
+++ b/libs/ardour/filesystem_paths.cc
@@ -17,10 +17,11 @@
 
 */
 #include <cstdlib>
+#include <iostream>
 
 #include "pbd/error.h"
 #include "pbd/compose.h"
-#include "pbd/filesystem_paths.h"
+#include "pbd/strsplit.h"
 
 #include <glibmm/miscutils.h>
 #include <glibmm/fileutils.h>
@@ -90,38 +91,72 @@ user_config_directory ()
 }
 
 sys::path
-ardour_module_directory ()
+ardour_dll_directory ()
 {
-       sys::path module_directory(MODULE_DIR);
-       module_directory /= "ardour3";
-       return module_directory;
+       std::string s = Glib::getenv("ARDOUR_DLL_PATH");
+       if (s.empty()) {
+               std::cerr << _("ARDOUR_CONFIG_PATH not set in environment - exiting\n");
+               ::exit (1);
+       }       
+       return sys::path (s);
 }
 
 SearchPath
-ardour_search_path ()
+ardour_config_search_path ()
 {
-       SearchPath spath_env(Glib::getenv("ARDOUR_PATH"));
-       return spath_env;
-}
-
-SearchPath
-system_config_search_path ()
-{
-       SearchPath config_path(system_config_directories());
-
-       config_path.add_subdirectory_to_paths("ardour3");
+       static bool have_path = false;
+       static SearchPath search_path;
+
+       if (!have_path) {
+               SearchPath sp (user_config_directory());
+               
+               std::string s = Glib::getenv("ARDOUR_CONFIG_PATH");
+               if (s.empty()) {
+                       std::cerr << _("ARDOUR_CONFIG_PATH not set in environment - exiting\n");
+                       ::exit (1);
+               }
+               
+               std::vector<string> ss;
+               split (s, ss, ':');
+               for (std::vector<string>::iterator i = ss.begin(); i != ss.end(); ++i) {
+                       sp += sys::path (*i);
+               }
+               
+               search_path = sp;
+               have_path = true;
+               std::cerr << "CONFIG PATH: " << search_path.to_string() << std::endl;
+       }
 
-       return config_path;
+       return search_path;
 }
 
 SearchPath
-system_data_search_path ()
+ardour_data_search_path ()
 {
-       SearchPath data_path(system_data_directories());
-
-       data_path.add_subdirectory_to_paths("ardour3");
+       static bool have_path = false;
+       static SearchPath search_path;
+
+       if (!have_path) {
+               SearchPath sp (user_config_directory());
+               
+               std::string s = Glib::getenv("ARDOUR_DATA_PATH");
+               if (s.empty()) {
+                       std::cerr << _("ARDOUR_DATA_PATH not set in environment - exiting\n");
+                       ::exit (1);
+               }
+               
+               std::vector<string> ss;
+               split (s, ss, ':');
+               for (std::vector<string>::iterator i = ss.begin(); i != ss.end(); ++i) {
+                       sp += sys::path (*i);
+               }
+               
+               search_path = sp;
+               have_path = true;
+               std::cerr << "DATA PATH: " << search_path.to_string() << std::endl;
+       }
 
-       return data_path;
+       return search_path;
 }
 
 } // namespace ARDOUR