undef SearchPath where needed as it is defined via windows.h

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

diff --git a/libs/ardour/midi_patch_manager.cc b/libs/ardour/midi_patch_manager.cc
index a2522fe997099ba2fec55a04ef15156f070632c5..f3541a2e628d28e75a9c65346d581ce484645f72 100644 (file)
--- a/libs/ardour/midi_patch_manager.cc
+++ b/libs/ardour/midi_patch_manager.cc
@@ -20,7 +20,8 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include "pbd/compose.h"
+#include <glibmm/fileutils.h>
+
 #include "pbd/file_utils.h"
 #include "pbd/error.h"
 
@@ -28,6 +29,12 @@
 #include "ardour/session_directory.h"
 #include "ardour/midi_patch_manager.h"
 
+#ifdef SearchPath
+#undef SearchPath
+#endif
+
+#include "ardour/midi_patch_search_path.h"
+
 #include "i18n.h"
 
 using namespace std;
@@ -35,45 +42,45 @@ using namespace ARDOUR;
 using namespace MIDI;
 using namespace MIDI::Name;
 using namespace PBD;
-using namespace PBD::sys;
 
 MidiPatchManager* MidiPatchManager::_manager = 0;
 
+MidiPatchManager::MidiPatchManager ()
+{
+       refresh ();
+}
+
 void
 MidiPatchManager::set_session (Session* s)
 {
        SessionHandlePtr::set_session (s);
-       refresh();
+       add_session_patches ();
 }
 
 void
-MidiPatchManager::refresh()
+MidiPatchManager::add_session_patches ()
 {
-       _documents.clear();
-       _master_devices_by_model.clear();
-       _all_models.clear();
-
        if (!_session) {
                return;
        }
+       
+       std::string path_to_patches = _session->session_directory().midi_patch_path();
 
-       path path_to_patches = _session->session_directory().midi_patch_path();
-
-       if (!exists(path_to_patches)) {
+       if (!Glib::file_test (path_to_patches, Glib::FILE_TEST_EXISTS)) {
                return;
        }
 
-       assert(is_directory(path_to_patches));
+       assert (Glib::file_test (path_to_patches, Glib::FILE_TEST_IS_DIR));
 
-       Glib::PatternSpec pattern(Glib::ustring("*.midnam"));
-       vector<path> result;
+       Glib::PatternSpec pattern(string("*.midnam"));
+       vector<std::string> result;
 
-       find_matching_files_in_directory(path_to_patches, pattern, result);
+       find_matching_files_in_directory (path_to_patches, pattern, result);
 
-       info << "Loading " << result.size() << " MIDI patches from " << path_to_patches.to_string() << endl;
+       info << "Loading " << result.size() << " MIDI patches from " << path_to_patches << endmsg;
 
-       for (vector<path>::iterator i = result.begin(); i != result.end(); ++i) {
-               boost::shared_ptr<MIDINameDocument> document(new MIDINameDocument(i->to_string()));
+       for (vector<std::string>::iterator i = result.begin(); i != result.end(); ++i) {
+               boost::shared_ptr<MIDINameDocument> document(new MIDINameDocument(*i));
                for (MIDINameDocument::MasterDeviceNamesList::const_iterator device =
                                        document->master_device_names_by_model().begin();
                                device != document->master_device_names_by_model().end();
@@ -83,7 +90,7 @@ MidiPatchManager::refresh()
                        _documents[device->first] = document;
                        // build a list of all master devices from all documents
                        _master_devices_by_model[device->first] = device->second;
-                       _all_models.push_back(device->first);
+                       _all_models.insert(device->first);
 
                        // make sure there are no double model names
                        // TODO: handle this gracefully.
@@ -93,6 +100,52 @@ MidiPatchManager::refresh()
        }
 }
 
+void
+MidiPatchManager::refresh()
+{
+       _documents.clear();
+       _master_devices_by_model.clear();
+       _all_models.clear();
+
+       SearchPath search_path = midi_patch_search_path ();
+       Glib::PatternSpec pattern (string("*.midnam"));
+       vector<std::string> result;
+
+       find_matching_files_in_search_path (search_path, pattern, result);
+
+       info << "Loading " << result.size() << " MIDI patches from " << search_path.to_string() << endmsg;
+
+       for (vector<std::string>::iterator i = result.begin(); i != result.end(); ++i) {
+               boost::shared_ptr<MIDINameDocument> document;
+               try {
+                       document = boost::shared_ptr<MIDINameDocument>(new MIDINameDocument(*i));
+               } catch (...) {
+                       error << "Error parsing MIDI patch file " << *i << endmsg;
+                       continue;
+               }
+               for (MIDINameDocument::MasterDeviceNamesList::const_iterator device =
+                            document->master_device_names_by_model().begin();
+                    device != document->master_device_names_by_model().end();
+                    ++device) {
+                       if (_documents.find(device->first) != _documents.end()) {
+                               warning << string_compose(_("Duplicate MIDI device `%1' in `%2' ignored"),
+                                                         device->first, *i)
+                                       << endmsg;
+                               continue;
+                       }
+                                                     
+                       _documents[device->first]               = document;
+                       _master_devices_by_model[device->first] = device->second;
+
+                       _all_models.insert(device->first);
+               }
+       }
+
+       if (_session) {
+               add_session_patches ();
+       }
+}
+
 void
 MidiPatchManager::session_going_away ()
 {