X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fpbd%2Fpbd%2Fsearch_path.h;h=74ac764dc0b6febba25590a14947b4f6b710e933;hb=ea32eecf3d2fa22c87350a3b198f8c13707627c6;hp=909bffb0a4af9ccc5443e741f9a8a37d739412ec;hpb=e279b9892b467aa823e253d97b6e9504cca0e252;p=ardour.git

diff --git a/libs/pbd/pbd/search_path.h b/libs/pbd/pbd/search_path.h
index 909bffb0a4..74ac764dc0 100644
--- a/libs/pbd/pbd/search_path.h
+++ b/libs/pbd/pbd/search_path.h
@@ -38,13 +38,13 @@ namespace PBD {
  * The Searchpath class does not test whether the paths exist
  * or are directories. It is basically just a container.
  */
-class /*LIBPBD_API*/ Searchpath : public std::vector<std::string>
+class LIBPBD_TEMPLATE_API Searchpath : public std::vector<std::string>
 {
 public:
 	/**
 	 * Create an empty Searchpath.
 	 */
-	LIBPBD_API Searchpath ();
+	LIBPBD_TEMPLATE_MEMBER_API Searchpath ();
 
 	/**
 	 * Initialize Searchpath from a string where the string contains
@@ -57,7 +57,7 @@ public:
 	 * 
 	 * @param search_path A path string.
 	 */
-	LIBPBD_API Searchpath (const std::string& search_path);
+	LIBPBD_TEMPLATE_MEMBER_API Searchpath (const std::string& search_path);
 
 	/**
 	 * Initialize Searchpath from a vector of paths that may or may
@@ -65,9 +65,9 @@ public:
 	 *
 	 * @param paths A vector of paths.
 	 */
-	LIBPBD_API Searchpath (const std::vector<std::string>& paths);
+	LIBPBD_TEMPLATE_MEMBER_API Searchpath (const std::vector<std::string>& paths);
 
-	LIBPBD_API ~Searchpath () {};
+	LIBPBD_TEMPLATE_MEMBER_API ~Searchpath () {};
 
 	/**
 	 * @return a search path string.
@@ -75,41 +75,56 @@ public:
 	 * The string that is returned contains the platform specific
 	 * path separator.
 	 */
-	LIBPBD_API const std::string to_string () const;
+	LIBPBD_TEMPLATE_MEMBER_API const std::string to_string () const;
 
 	/**
 	 * Add all the directories in path to this.
 	 */
-	LIBPBD_API Searchpath& operator+= (const Searchpath& spath);
+	LIBPBD_TEMPLATE_MEMBER_API Searchpath& operator+= (const Searchpath& spath);
 
 	/**
 	 * Add another directory path to the search path.
 	 */
-	LIBPBD_API Searchpath& operator+= (const std::string& directory_path);
+	LIBPBD_TEMPLATE_MEMBER_API Searchpath& operator+= (const std::string& directory_path);
 	
 	/**
 	 * Concatenate another Searchpath onto this.
 	 */
-	LIBPBD_API Searchpath& operator+ (const Searchpath& other);
+	LIBPBD_TEMPLATE_MEMBER_API const Searchpath operator+ (const Searchpath& other);
 	
 	/**
 	 * Add another path to the search path.
 	 */
-	LIBPBD_API Searchpath& operator+ (const std::string& directory_path);
+	LIBPBD_TEMPLATE_MEMBER_API const Searchpath operator+ (const std::string& directory_path);
+
+	/**
+	 * Remove all the directories in path from this.
+	 */
+	LIBPBD_TEMPLATE_MEMBER_API Searchpath& operator-= (const Searchpath& spath);
+
+	/**
+	 * Remove a directory path from the search path.
+	 */
+	LIBPBD_TEMPLATE_MEMBER_API Searchpath& operator-= (const std::string& directory_path);
 
 	/**
 	 * Add a sub-directory to each path in the search path.
 	 * @param subdir The directory name, it should not contain 
 	 * any path separating tokens.
 	 */
-	LIBPBD_API Searchpath& add_subdirectory_to_paths (const std::string& subdir);
+	LIBPBD_TEMPLATE_MEMBER_API Searchpath& add_subdirectory_to_paths (const std::string& subdir);
 
 protected:
 
-	LIBPBD_API void add_directory (const std::string& directory_path);
-	LIBPBD_API void add_directories (const std::vector<std::string>& paths);
+	LIBPBD_TEMPLATE_MEMBER_API void add_directory (const std::string& directory_path);
+	LIBPBD_TEMPLATE_MEMBER_API void add_directories (const std::vector<std::string>& paths);
+	LIBPBD_TEMPLATE_MEMBER_API void remove_directory (const std::string& directory_path);
+	LIBPBD_TEMPLATE_MEMBER_API void remove_directories (const std::vector<std::string>& paths);
 };
 
+LIBPBD_API void export_search_path (const std::string& base_dir, const char* varname, const char* dir);
+
+
 } // namespace PBD
 
 #endif /* __libpbd_search_path_h__ */