enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h

[ardour.git] / libs / ardour / panner_manager.cc

diff --git a/libs/ardour/panner_manager.cc b/libs/ardour/panner_manager.cc
index 2988a8ab467ed459c1e87db284c3123083454435..c6b73b40775fbdac0ce8d58bd9ed723d600b0573 100644 (file)
--- a/libs/ardour/panner_manager.cc
+++ b/libs/ardour/panner_manager.cc
@@ -24,7 +24,7 @@
 
 #include "pbd/error.h"
 #include "pbd/compose.h"
-#include "pbd/pathscanner.h"
+#include "pbd/file_utils.h"
 #include "pbd/stl_delete.h"
 
 #include "ardour/debug.h"
@@ -32,7 +32,7 @@
 
 #include "ardour/search_paths.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -90,13 +90,11 @@ static bool panner_filter (const string& str, void */*arg*/)
 void
 PannerManager::discover_panners ()
 {
-       PathScanner scanner;
        std::vector<std::string> panner_modules;
-       std::string search_path = panner_search_path().to_string();
 
-       DEBUG_TRACE (DEBUG::Panning, string_compose (_("looking for panners in %1\n"), search_path));
+       DEBUG_TRACE (DEBUG::Panning, string_compose (_("looking for panners in %1\n"), panner_search_path().to_string()));
 
-       panner_modules = scanner (search_path, panner_filter, 0, false, true, 1, true);
+       find_files_matching_filter (panner_modules, panner_search_path(), panner_filter, 0, false, true, true);
 
        for (vector<std::string>::iterator i = panner_modules.begin(); i != panner_modules.end(); ++i) {
                panner_discover (*i);