Remove PathScanner::run_scan and use PathScanner::run_scan_internal directly

[ardour.git] / libs / pbd / pbd / pathscanner.h

diff --git a/libs/pbd/pbd/pathscanner.h b/libs/pbd/pbd/pathscanner.h
index 346e7858c42daa53ed2f90e6313148925a53e966..d97cbb769327b95281ff66f50b4af30cde2db11c 100644 (file)
--- a/libs/pbd/pbd/pathscanner.h
+++ b/libs/pbd/pbd/pathscanner.h
@@ -1,66 +1,90 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __libmisc_pathscanner_h__
 #define __libmisc_pathscanner_h__
 
 #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) {
+               std::vector<std::string> result;
+               run_scan_internal (result, dirpath,
+                                  filter, arg,
+                                  match_fullpath, return_fullpath,
+                                  limit, recurse);
+               return result;
+       }
 
+       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);
-    
+       void find_files_matching_regex (std::vector<std::string>& results,
+                       const std::string& dirpath,
+                       const std::string& regexp,
+                       bool match_fullpath,
+                       bool return_fullpath,
+                       long limit,
+                       bool recurse = false);
 
+       void run_scan_internal (std::vector<std::string>&,
+                               const std::string &dirpath,
+                               bool (*filter)(const std::string &, void *),
+                               void *arg,
+                               bool match_fullpath,
+                               bool return_fullpath,
+                               long limit,
+                               bool recurse = false);
 };
 
 #endif // __libmisc_pathscanner_h__