replace fixed-point linear interpolation with double-based version, thereby removing...

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

diff --git a/libs/ardour/filesystem_paths.cc b/libs/ardour/filesystem_paths.cc
index 5ce4f4f7ed16036154e2a8e5c9503a77fb5e2f49..7372c467a65bf2ca3d4dbf43ae4c0883a229d924 100644 (file)
--- a/libs/ardour/filesystem_paths.cc
+++ b/libs/ardour/filesystem_paths.cc
@@ -17,12 +17,17 @@
 
 */
 
-#include <pbd/error.h>
+#include "pbd/error.h"
+#include "pbd/filesystem_paths.h"
 
 #include <glibmm/miscutils.h>
 
-#include <ardour/directory_names.h>
-#include <ardour/filesystem_paths.h>
+#include "ardour/directory_names.h"
+#include "ardour/filesystem_paths.h"
+
+#define WITH_STATIC_PATHS 1
+
+using namespace PBD;
 
 namespace ARDOUR {
 
@@ -33,8 +38,7 @@ user_config_directory ()
 {
        const string home_dir = Glib::get_home_dir ();
 
-       if (home_dir.empty ())
-       {
+       if (home_dir.empty ()) {
                const string error_msg = "Unable to determine home directory";
 
                // log the error
@@ -53,8 +57,43 @@ sys::path
 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