X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Ffilesystem_paths.h;h=120ae25f97474246395fdaf4ee90b3773d32da3d;hb=bc3aea6f93edf23c19dc672dd5b1f44bca71f571;hp=c5b8b2a057f1bf4c8cb1ddcbcc1b737458763517;hpb=c37a944b15d67c1c4287c29647172f1ac54f1dee;p=ardour.git

diff --git a/libs/ardour/ardour/filesystem_paths.h b/libs/ardour/ardour/filesystem_paths.h
index c5b8b2a057..120ae25f97 100644
--- a/libs/ardour/ardour/filesystem_paths.h
+++ b/libs/ardour/ardour/filesystem_paths.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2007 Tim Mayberry 
+    Copyright (C) 2007 Tim Mayberry
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -20,26 +20,35 @@
 #ifndef ARDOUR_FILESYSTEM_PATHS_INCLUDED
 #define ARDOUR_FILESYSTEM_PATHS_INCLUDED
 
-#include <pbd/filesystem.h>
-#include <pbd/search_path.h>
+#include "pbd/filesystem.h"
+#include "pbd/search_path.h"
 
 namespace ARDOUR {
 
-	using namespace PBD;
-
 	/**
 	 * @return the path to the directory used to store user specific ardour
 	 * configuration files.
 	 */
-	sys::path user_config_directory ();
+	PBD::sys::path user_config_directory ();
 
 	/**
 	 * @return the path to the directory that contains the system wide ardour
 	 * modules.
 	 */
-	sys::path ardour_module_directory ();
+	PBD::sys::path ardour_dll_directory ();
+
+	/**
+	 * @return the search path to be used when looking for per-system
+	 * configuration files. This may include user configuration files.
+	 */
+	PBD::SearchPath ardour_config_search_path ();
 
-	SearchPath config_search_path ();
+	/**
+	 * @return the search path to be used when looking for data files
+	 * that could be shared by systems (h/w and configuration independent
+	 * files, such as icons, XML files, etc)
+	 */
+	PBD::SearchPath ardour_data_search_path ();
 
 } // namespace ARDOUR