Remove unnecessary 0 checks before delete; see http://www.parashift.com/c++-faq-lite...

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

diff --git a/libs/ardour/filesystem_paths.cc b/libs/ardour/filesystem_paths.cc
index 465d07bddc86d93f9783334a00315e44fc1e86b8..d36bce21466a2f7ce15c01dea49b2fcde6e3cbb8 100644 (file)
--- a/libs/ardour/filesystem_paths.cc
+++ b/libs/ardour/filesystem_paths.cc
@@ -18,12 +18,15 @@
 */
 
 #include <pbd/error.h>
+#include <pbd/filesystem_paths.h>
 
 #include <glibmm/miscutils.h>
 
 #include <ardour/directory_names.h>
 #include <ardour/filesystem_paths.h>
 
+#define WITH_STATIC_PATHS 1
+
 namespace ARDOUR {
 
 using std::string;
@@ -50,11 +53,54 @@ user_config_directory ()
 }
 
 sys::path
-system_module_directory ()
+ardour_module_directory ()
 {
        sys::path module_directory(MODULE_DIR);
-       module_directory /= "ardour2";
+       module_directory /= "ardour3";
        return module_directory;
 }
 
+SearchPath
+ardour_search_path ()
+{
+       SearchPath spath_env(Glib::getenv("ARDOUR_PATH"));
+       return spath_env;
+}
+
+SearchPath
+system_config_search_path ()
+{
+#ifdef WITH_STATIC_PATHS
+
+       SearchPath config_path(string(CONFIG_DIR));
+
+#else
+
+       SearchPath config_path(system_config_directories());
+
+#endif
+
+       config_path.add_subdirectory_to_paths("ardour3");
+
+       return config_path;
+}
+
+SearchPath
+system_data_search_path ()
+{
+#ifdef WITH_STATIC_PATHS
+
+       SearchPath data_path(string(DATA_DIR));
+
+#else
+
+       SearchPath data_path(system_data_directories());
+
+#endif
+
+       data_path.add_subdirectory_to_paths("ardour3");
+
+       return data_path;
+}
+
 } // namespace ARDOUR