fix construction of new xfades from legacy xfades, and add a few comments here and...

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

diff --git a/libs/ardour/ardour/filesystem_paths.h b/libs/ardour/ardour/filesystem_paths.h
index c5b8b2a057f1bf4c8cb1ddcbcc1b737458763517..120ae25f97474246395fdaf4ee90b3773d32da3d 100644 (file)
--- 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