ardour/livetrax
13
0
Fork 0
Code

Only parse additional Session midnam files on Session load

Browse Source 
When loading a Session add the Session patchfiles directory to the
MidiPatchManager search path and only process/parse the files for that
directory rather than refreshing/reparsing all the files. Similarly for unload,
just unload the devices that are from the Session specific midnam files instead
of removing the path and refreshing/reparsing all the files.

This will not remove the "system" midnam files as they are always added first
and duplicates from the session patchfiles directory are ignored.
This commit is contained in:
Tim Mayberry 2015-10-19 20:23:33 +10:00 committed by Paul Davis
parent efc26a0490
commit e93ba53309
2 changed files with 60 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/ardour/ardour/midi_patch_manager.h
View File

@ -139,9 +139,11 @@ public:
const DeviceNamesByMaker& devices_by_manufacturer() const { return _devices_by_manufacturer; }
private:
void refresh();
bool add_midi_name_document(const std::string& file_path);
bool remove_midi_name_document(const std::string& file_path);
void add_midnam_files_from_directory(const std::string& directory_path);
void remove_midnam_files_from_directory(const std::string& directory_path);
private:
PBD::Searchpath _search_path;

82
libs/ardour/midi_patch_manager.cc
View File

@ -47,8 +47,6 @@ MidiPatchManager::MidiPatchManager ()
void
MidiPatchManager::add_search_path (const Searchpath& search_path)
{
bool do_refresh = false;
for (Searchpath::const_iterator i = search_path.begin(); i != search_path.end(); ++i) {
if (_search_path.contains(*i)) {
@ -64,32 +62,52 @@ MidiPatchManager::add_search_path (const Searchpath& search_path)
continue;
}
_search_path.add_directory (*i);
do_refresh = true;
}
add_midnam_files_from_directory (*i);
if (do_refresh) {
refresh();
_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 << "Loading " << result.size() << " MIDI patches from " << 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)
{
bool do_refresh = false;
for (Searchpath::const_iterator i = search_path.begin(); i != search_path.end(); ++i) {
if (!_search_path.contains(*i)) {
continue;
}
_search_path.remove_directory (*i);
do_refresh = true;
}
remove_midnam_files_from_directory(*i);
if (do_refresh) {
refresh();
_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 << "Unloading " << result.size() << " MIDI patches from "
<< directory_path << endmsg;
for (vector<std::string>::const_iterator i = result.begin(); i != result.end(); ++i) {
remove_midi_name_document (*i);
}
}
@ -135,22 +153,34 @@ MidiPatchManager::add_midi_name_document (const std::string& file_path)
return true;
}
void
MidiPatchManager::refresh()
bool
MidiPatchManager::remove_midi_name_document (const std::string& file_path)
{
_documents.clear();
_master_devices_by_model.clear();
_all_models.clear();
_devices_by_manufacturer.clear();
bool removed = false;
for (MidiNameDocuments::iterator i = _documents.begin(); i != _documents.end();) {
if (i->second->file_path() == file_path) {
vector<std::string> result;
boost::shared_ptr<MIDINameDocument> document = i->second;
find_files_matching_pattern (result, _search_path, "*.midnam");
_documents.erase(i++);
info << "Loading " << result.size() << " MIDI patches from "
<< _search_path.to_string() << endmsg;
for (MIDINameDocument::MasterDeviceNamesList::const_iterator device =
document->master_device_names_by_model().begin();
device != document->master_device_names_by_model().end();
++device) {
for (vector<std::string>::iterator i = result.begin(); i != result.end(); ++i) {
add_midi_name_document (*i);
_master_devices_by_model.erase(device->first);
_all_models.erase(device->first);
const std::string& manufacturer = device->second->manufacturer();
_devices_by_manufacturer[manufacturer].erase(device->first);
}
removed = true;
} else {
++i;
}
}
return removed;
}