X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fpbd%2Fpbd%2Fpathscanner.h;h=d62203c008c2c13c67d214f2eb82540fffc0548d;hb=c0e6f8e4c324c3f44613949b59acd9e864ab263d;hp=0a48d4d949eec7c084b553bda1f9f125158819c1;hpb=2e8f80e37a7d20deb3f138cd72c26f8c6de9d1ab;p=ardour.git

diff --git a/libs/pbd/pbd/pathscanner.h b/libs/pbd/pbd/pathscanner.h
index 0a48d4d949..d62203c008 100644
--- a/libs/pbd/pbd/pathscanner.h
+++ b/libs/pbd/pbd/pathscanner.h
@@ -22,64 +22,77 @@
 
 #include <vector>
 #include <string>
+#ifdef COMPILER_MSVC
+#include <ardourext/misc.h>
+#else
 #include <regex.h>
+#endif
 
-using std::string;
-using std::vector;
+#include "pbd/libpbd_visibility.h"
 
-class PathScanner
+class LIBPBD_API PathScanner
 
 {
   public:
-    vector<string *> *operator() (const string &dirpath,
-				  bool (*filter)(const string &, void *arg),
-				  void *arg, 
-				  bool match_fullpath = true,
-				  bool return_fullpath = true,
-				  long limit = -1) {
-	    return run_scan (dirpath,
-			     (bool (PathScanner::*)(const string &)) 0, 
-			     filter, 
-			     arg,
-			     match_fullpath,
-			     return_fullpath, 
-			     limit);
-    }
-
-    vector<string *> *operator() (const string &dirpath,
-				  const string &regexp,
-				  bool match_fullpath = true,
-				  bool return_fullpath = true,
-				  long limit = -1);
-
-    
-    string *find_first (const string &dirpath,
-			const string &regexp,
-			bool match_fullpath = true,
-			bool return_fullpath = true);
-
-    string *find_first (const string &dirpath,
-			bool (*filter)(const string &, void *),
-			void *arg,
-			bool match_fullpath = true,
-			bool return_fullpath = true);
-
+	std::vector<std::string *> *operator() (const std::string &dirpath,
+						bool (*filter)(const std::string &, void *arg),
+						void *arg, 
+						bool match_fullpath = true,
+						bool return_fullpath = true,
+						long limit = -1,
+						bool recurse = false) {
+		return run_scan (dirpath,
+				 (bool (PathScanner::*)(const std::string &)) 0, 
+				 filter, 
+				 arg,
+				 match_fullpath,
+				 return_fullpath, 
+				 limit, recurse);
+	}
+
+	std::vector<std::string *> *operator() (const std::string &dirpath,
+						const std::string &regexp,
+						bool match_fullpath = true,
+						bool return_fullpath = true,
+						long limit = -1,
+						bool recurse = false);
+	
+	std::string *find_first (const std::string &dirpath,
+				 const std::string &regexp,
+				 bool match_fullpath = true,
+				 bool return_fullpath = true);
+	
+	std::string *find_first (const std::string &dirpath,
+				 bool (*filter)(const std::string &, void *),
+				 void *arg,
+				 bool match_fullpath = true,
+				 bool return_fullpath = true);
+	
   private:
-    regex_t compiled_pattern;
-    
-    bool regexp_filter (const string &str) {
-	    return regexec (&compiled_pattern, str.c_str(), 0, 0, 0) == 0;
-    }
-
-    vector<string *> *run_scan (const string &dirpath,
-				bool (PathScanner::*mfilter) (const string &),
-				bool (*filter)(const string &, void *),
-				void *arg,
-				bool match_fullpath,
-				bool return_fullpath,
-				long limit);
-    
-
+	regex_t compiled_pattern;
+	
+	bool regexp_filter (const std::string &str) {
+		return regexec (&compiled_pattern, str.c_str(), 0, 0, 0) == 0;
+	}
+	
+	std::vector<std::string *> *run_scan (const std::string &dirpath,
+					      bool (PathScanner::*mfilter) (const std::string &),
+					      bool (*filter)(const std::string &, void *),
+					      void *arg,
+					      bool match_fullpath,
+					      bool return_fullpath,
+					      long limit,
+					      bool recurse = false);
+
+	std::vector<std::string *> *run_scan_internal (std::vector<std::string*>*, 
+						       const std::string &dirpath,
+						       bool (PathScanner::*mfilter) (const std::string &),
+						       bool (*filter)(const std::string &, void *),
+						       void *arg,
+						       bool match_fullpath,
+						       bool return_fullpath,
+						       long limit,
+						       bool recurse = false);
 };
 
 #endif // __libmisc_pathscanner_h__