Add a test for the constrained cubic interpolation of Evoral::Curve

[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 ac57ae93c69d799a0be53dea910e7d08b010b232..e0638f035e510232d27e5701b5e216990451ac38 100644 (file)
--- a/libs/ardour/midi_patch_manager.cc
+++ b/libs/ardour/midi_patch_manager.cc
@@ -28,7 +28,10 @@
 #include "ardour/session.h"
 #include "ardour/session_directory.h"
 #include "ardour/midi_patch_manager.h"
-#include "ardour/midi_patch_search_path.h"
+
+#include "ardour/search_paths.h"
+
+#include "i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -47,6 +50,7 @@ void
 MidiPatchManager::set_session (Session* s)
 {
        SessionHandlePtr::set_session (s);
+       refresh ();
        add_session_patches ();
 }
 
@@ -65,10 +69,9 @@ MidiPatchManager::add_session_patches ()
 
        assert (Glib::file_test (path_to_patches, Glib::FILE_TEST_IS_DIR));
 
-       Glib::PatternSpec pattern(string("*.midnam"));
        vector<std::string> result;
 
-       find_matching_files_in_directory (path_to_patches, pattern, result);
+       find_files_matching_pattern (result, path_to_patches, "*.midnam");
 
        info << "Loading " << result.size() << " MIDI patches from " << path_to_patches << endmsg;
 
@@ -83,7 +86,13 @@ MidiPatchManager::add_session_patches ()
                        _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);
+                       const std::string& manufacturer = device->second->manufacturer();
+                       if (_devices_by_manufacturer.find(manufacturer) == _devices_by_manufacturer.end()) {
+                               MIDINameDocument::MasterDeviceNamesList empty;
+                               _devices_by_manufacturer.insert(std::make_pair(manufacturer, empty));
+                       }
+                       _devices_by_manufacturer[manufacturer].insert(std::make_pair(device->first, device->second));
 
                        // make sure there are no double model names
                        // TODO: handle this gracefully.
@@ -99,32 +108,44 @@ MidiPatchManager::refresh()
        _documents.clear();
        _master_devices_by_model.clear();
        _all_models.clear();
+       _devices_by_manufacturer.clear();
 
-       SearchPath search_path = midi_patch_search_path ();
-       Glib::PatternSpec pattern (string("*.midnam"));
+       Searchpath search_path = midi_patch_search_path ();
        vector<std::string> result;
 
-       find_matching_files_in_search_path (search_path, pattern, result);
+       find_files_matching_pattern (result, search_path, "*.midnam");
 
        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(new MIDINameDocument(*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) {
-                       //cerr << "got model " << device->first << endl;
-                       // have access to the documents by model name
-                       _documents[device->first] = document;
-                       // build a list of all master devices from all documents
+                            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.push_back(device->first);
 
-                       // make sure there are no double model names
-                       // TODO: handle this gracefully.
-                       assert(_documents.count(device->first) == 1);
-                       assert(_master_devices_by_model.count(device->first) == 1);
+                       _all_models.insert(device->first);
+                       const std::string& manufacturer = device->second->manufacturer();
+                       if (_devices_by_manufacturer.find(manufacturer) == _devices_by_manufacturer.end()) {
+                               MIDINameDocument::MasterDeviceNamesList empty;
+                               _devices_by_manufacturer.insert(std::make_pair(manufacturer, empty));
+                       }
+                       _devices_by_manufacturer[manufacturer].insert(std::make_pair(device->first, device->second));
                }
        }
 
@@ -137,5 +158,8 @@ void
 MidiPatchManager::session_going_away ()
 {
        SessionHandlePtr::session_going_away ();
-       refresh ();
+       _documents.clear();
+       _master_devices_by_model.clear();
+       _all_models.clear();
+       _devices_by_manufacturer.clear();
 }