globally remove all trailing whitespace from ardour code base.

[ardour.git] / libs / surfaces / mackie / device_profile.cc

diff --git a/libs/surfaces/mackie/device_profile.cc b/libs/surfaces/mackie/device_profile.cc
index ddbb4782db779d5168a2744ad22a56683c768b93..c4cd9bf1a8f953885e2dd2b234718ffe4dcdfa7b 100644 (file)
--- a/libs/surfaces/mackie/device_profile.cc
+++ b/libs/surfaces/mackie/device_profile.cc
@@ -24,7 +24,8 @@
 
 #include "pbd/xml++.h"
 #include "pbd/error.h"
-#include "pbd/pathscanner.h"
+#include "pbd/file_utils.h"
+#include "pbd/stl_delete.h"
 #include "pbd/replace_all.h"
 
 #include "ardour/filesystem_paths.h"
@@ -34,9 +35,11 @@
 
 #include "i18n.h"
 
-using namespace Mackie;
 using namespace PBD;
 using namespace ARDOUR;
+using namespace ArdourSurface;
+using namespace Mackie;
+
 using std::string;
 using std::vector;
 
@@ -87,27 +90,21 @@ devprofile_filter (const string &str, void* /*arg*/)
 void
 DeviceProfile::reload_device_profiles ()
 {
-       DeviceProfile dp;
        vector<string> s;
-       vector<string *> *devprofiles;
-       PathScanner scanner;
+       vector<string> devprofiles;
        Searchpath spath (devprofile_search_path());
 
-       devprofiles = scanner (spath.to_string(), devprofile_filter, 0, false, true);
+       find_files_matching_filter (devprofiles, spath, devprofile_filter, 0, false, true);
        device_profiles.clear ();
 
-       if (!devprofiles) {
+       if (devprofiles.empty()) {
                error << "No MCP device info files found using " << spath.to_string() << endmsg;
                return;
        }
 
-       if (devprofiles->empty()) {
-               error << "No MCP device info files found using " << spath.to_string() << endmsg;
-               return;
-       }
-
-       for (vector<string*>::iterator i = devprofiles->begin(); i != devprofiles->end(); ++i) {
-               string fullpath = *(*i);
+       for (vector<string>::iterator i = devprofiles.begin(); i != devprofiles.end(); ++i) {
+               string fullpath = *i;
+               DeviceProfile dp; // has to be initial every loop or info from last added.
 
                XMLTree tree;
 
@@ -125,8 +122,6 @@ DeviceProfile::reload_device_profiles ()
                        device_profiles[dp.name()] = dp;
                }
        }
-
-       delete devprofiles;
 }
 
 int
@@ -140,7 +135,7 @@ DeviceProfile::set_state (const XMLNode& node, int /* version */)
        }
 
        /* name is mandatory */
- 
+
        if ((child = node.child ("Name")) == 0 || (prop = child->property ("value")) == 0) {
                return -1;
        } else {
@@ -162,7 +157,7 @@ DeviceProfile::set_state (const XMLNode& node, int /* version */)
 
                                int id = Button::name_to_id (prop->value());
                                if (id < 0) {
-                                       error << string_compose ("Unknow button ID \"%1\"", prop->value()) << endmsg;
+                                       error << string_compose ("Unknown button ID \"%1\"", prop->value()) << endmsg;
                                        continue;
                                }