ardour/livetrax
13
0
Fork 0
Code

Refactor common code in MidiPatchManager class into new method

Browse Source
This commit is contained in:
Tim Mayberry 2015-10-19 10:08:47 +10:00 committed by Paul Davis
parent 9fd75e33fe
commit ee9f369e38
2 changed files with 46 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,6 +142,8 @@ private:
void refresh(); void refresh();
void add_session_patches(); void add_session_patches();
bool add_midi_name_document(const std::string& file_path);
MidiNameDocuments _documents; MidiNameDocuments _documents;
MIDINameDocument::MasterDeviceNamesList _master_devices_by_model; MIDINameDocument::MasterDeviceNamesList _master_devices_by_model;
DeviceNamesByMaker _devices_by_manufacturer; DeviceNamesByMaker _devices_by_manufacturer;

96
libs/ardour/midi_patch_manager.cc
View File

@ -53,6 +53,48 @@ MidiPatchManager::set_session (Session* s)
add_session_patches (); add_session_patches ();
} }
bool
MidiPatchManager::add_midi_name_document (const std::string& file_path)
{
boost::shared_ptr<MIDINameDocument> document;
try {
document = boost::shared_ptr<MIDINameDocument>(new MIDINameDocument(file_path));
}
catch (...) {
error << "Error parsing MIDI patch file " << file_path << endmsg;
return false;
}
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,
file_path) << endmsg;
continue;
}
_documents[device->first] = document;
_master_devices_by_model[device->first] = device->second;
_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));
// TODO: handle this gracefully.
assert(_documents.count(device->first) == 1);
assert(_master_devices_by_model.count(device->first) == 1);
}
return true;
}
void void
MidiPatchManager::add_session_patches () MidiPatchManager::add_session_patches ()
{ {
@ -75,29 +117,7 @@ MidiPatchManager::add_session_patches ()
info << "Loading " << result.size() << " MIDI patches from " << path_to_patches << endmsg; info << "Loading " << result.size() << " MIDI patches from " << path_to_patches << endmsg;
for (vector<std::string>::iterator i = result.begin(); i != result.end(); ++i) { for (vector<std::string>::iterator i = result.begin(); i != result.end(); ++i) {
boost::shared_ptr<MIDINameDocument> document(new MIDINameDocument(*i)); add_midi_name_document(*i);
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
_master_devices_by_model[device->first] = device->second;
_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.
assert(_documents.count(device->first) == 1);
assert(_master_devices_by_model.count(device->first) == 1);
}
} }
} }
@ -117,35 +137,7 @@ MidiPatchManager::refresh()
info << "Loading " << result.size() << " MIDI patches from " << search_path.to_string() << endmsg; info << "Loading " << result.size() << " MIDI patches from " << search_path.to_string() << endmsg;
for (vector<std::string>::iterator i = result.begin(); i != result.end(); ++i) { for (vector<std::string>::iterator i = result.begin(); i != result.end(); ++i) {
boost::shared_ptr<MIDINameDocument> document; add_midi_name_document (*i);
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);
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));
}
} }
if (_session) { if (_session) {