fix bypassing plugins with sidechain i/o

[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 6852de8ba31b1ce4f3bcfd8b3ae71c41b26a2d24..133f4ee7f81946e8f93ba10897d2ae8c2577aa7d 100644 (file)
--- a/libs/ardour/midi_patch_manager.cc
+++ b/libs/ardour/midi_patch_manager.cc
@@ -25,8 +25,6 @@
 #include "pbd/file_utils.h"
 #include "pbd/error.h"
 
-#include "ardour/session.h"
-#include "ardour/session_directory.h"
 #include "ardour/midi_patch_manager.h"
 
 #include "ardour/search_paths.h"
@@ -43,14 +41,78 @@ MidiPatchManager* MidiPatchManager::_manager = 0;
 
 MidiPatchManager::MidiPatchManager ()
 {
+       add_search_path(midi_patch_search_path ());
 }
 
 void
-MidiPatchManager::set_session (Session* s)
+MidiPatchManager::add_search_path (const Searchpath& search_path)
 {
-       SessionHandlePtr::set_session (s);
-       refresh ();
-       add_session_patches ();
+       for (Searchpath::const_iterator i = search_path.begin(); i != search_path.end(); ++i) {
+
+               if (_search_path.contains(*i)) {
+                       // already processed files from this path
+                       continue;
+               }
+
+               if (!Glib::file_test (*i, Glib::FILE_TEST_EXISTS)) {
+                       continue;
+               }
+
+               if (!Glib::file_test (*i, Glib::FILE_TEST_IS_DIR)) {
+                       continue;
+               }
+
+               add_midnam_files_from_directory (*i);
+
+               _search_path.add_directory (*i);
+       }
+}
+
+void
+MidiPatchManager::add_midnam_files_from_directory(const std::string& directory_path)
+{
+       vector<std::string> result;
+       find_files_matching_pattern (result, directory_path, "*.midnam");
+
+       info << string_compose(
+                       P_("Loading %1 MIDI patch from %2", "Loading %1 MIDI patches from %2", result.size()),
+                       result.size(), directory_path)
+            << endmsg;
+
+       for (vector<std::string>::const_iterator i = result.begin(); i != result.end(); ++i) {
+               add_midi_name_document (*i);
+       }
+}
+
+void
+MidiPatchManager::remove_search_path (const Searchpath& search_path)
+{
+       for (Searchpath::const_iterator i = search_path.begin(); i != search_path.end(); ++i) {
+
+               if (!_search_path.contains(*i)) {
+                       continue;
+               }
+
+               remove_midnam_files_from_directory(*i);
+
+               _search_path.remove_directory (*i);
+       }
+}
+
+void
+MidiPatchManager::remove_midnam_files_from_directory(const std::string& directory_path)
+{
+       vector<std::string> result;
+       find_files_matching_pattern (result, directory_path, "*.midnam");
+
+       info << string_compose(
+                       P_("Unloading %1 MIDI patch from %2", "Unloading %1 MIDI patches from %2", result.size()),
+                       result.size(), directory_path)
+            << endmsg;
+
+       for (vector<std::string>::const_iterator i = result.begin(); i != result.end(); ++i) {
+               remove_midi_name_document (*i);
+       }
 }
 
 bool
@@ -61,7 +123,8 @@ MidiPatchManager::add_midi_name_document (const std::string& file_path)
                document = boost::shared_ptr<MIDINameDocument>(new MIDINameDocument(file_path));
        }
        catch (...) {
-               error << "Error parsing MIDI patch file " << file_path << endmsg;
+               error << string_compose(_("Error parsing MIDI patch file %1"), file_path)
+                     << endmsg;
                return false;
        }
        for (MIDINameDocument::MasterDeviceNamesList::const_iterator device =
@@ -95,62 +158,36 @@ MidiPatchManager::add_midi_name_document (const std::string& file_path)
        return true;
 }
 
-void
-MidiPatchManager::add_session_patches ()
+bool
+MidiPatchManager::remove_midi_name_document (const std::string& file_path)
 {
-       if (!_session) {
-               return;
-       }
-
-       std::string path_to_patches = _session->session_directory().midi_patch_path();
-
-       if (!Glib::file_test (path_to_patches, Glib::FILE_TEST_EXISTS)) {
-               return;
-       }
-
-       assert (Glib::file_test (path_to_patches, Glib::FILE_TEST_IS_DIR));
+       bool removed = false;
+       for (MidiNameDocuments::iterator i = _documents.begin(); i != _documents.end();) {
+               if (i->second->file_path() == file_path) {
 
-       vector<std::string> result;
-
-       find_files_matching_pattern (result, path_to_patches, "*.midnam");
+                       boost::shared_ptr<MIDINameDocument> document = i->second;
 
-       info << "Loading " << result.size() << " MIDI patches from " << path_to_patches << endmsg;
+                       info << string_compose(_("Removing MIDI patch file %1"), file_path) << endmsg;
 
-       for (vector<std::string>::iterator i = result.begin(); i != result.end(); ++i) {
-               add_midi_name_document(*i);
-       }
-}
+                       _documents.erase(i++);
 
-void
-MidiPatchManager::refresh()
-{
-       _documents.clear();
-       _master_devices_by_model.clear();
-       _all_models.clear();
-       _devices_by_manufacturer.clear();
+                       for (MIDINameDocument::MasterDeviceNamesList::const_iterator device =
+                                document->master_device_names_by_model().begin();
+                            device != document->master_device_names_by_model().end();
+                            ++device) {
 
-       Searchpath search_path = midi_patch_search_path ();
-       vector<std::string> result;
+                               _master_devices_by_model.erase(device->first);
 
-       find_files_matching_pattern (result, search_path, "*.midnam");
+                               _all_models.erase(device->first);
 
-       info << "Loading " << result.size() << " MIDI patches from " << search_path.to_string() << endmsg;
+                               const std::string& manufacturer = device->second->manufacturer();
 
-       for (vector<std::string>::iterator i = result.begin(); i != result.end(); ++i) {
-               add_midi_name_document (*i);
-       }
-
-       if (_session) {
-               add_session_patches ();
+                               _devices_by_manufacturer[manufacturer].erase(device->first);
+                       }
+                       removed = true;
+               } else {
+                       ++i;
+               }
        }
-}
-
-void
-MidiPatchManager::session_going_away ()
-{
-       SessionHandlePtr::session_going_away ();
-       _documents.clear();
-       _master_devices_by_model.clear();
-       _all_models.clear();
-       _devices_by_manufacturer.clear();
+       return removed;
 }