Gracefully handle errors parsing midnam documents instead of crashing.
git-svn-id: svn://localhost/ardour2/branches/3.0@13904 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
444d89b669
commit
85d9fa3b25
@ -30,6 +30,8 @@
|
|||||||
#include "ardour/midi_patch_manager.h"
|
#include "ardour/midi_patch_manager.h"
|
||||||
#include "ardour/midi_patch_search_path.h"
|
#include "ardour/midi_patch_search_path.h"
|
||||||
|
|
||||||
|
#include "i18n.h"
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
using namespace ARDOUR;
|
using namespace ARDOUR;
|
||||||
using namespace MIDI;
|
using namespace MIDI;
|
||||||
@ -109,22 +111,28 @@ 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(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 =
|
for (MIDINameDocument::MasterDeviceNamesList::const_iterator device =
|
||||||
document->master_device_names_by_model().begin();
|
document->master_device_names_by_model().begin();
|
||||||
device != document->master_device_names_by_model().end();
|
device != document->master_device_names_by_model().end();
|
||||||
++device) {
|
++device) {
|
||||||
//cerr << "got model " << device->first << endl;
|
if (_documents.find(device->first) != _documents.end()) {
|
||||||
// have access to the documents by model name
|
warning << string_compose(_("Duplicate MIDI device `%1' in `%2' ignored"),
|
||||||
_documents[device->first] = document;
|
device->first, *i)
|
||||||
// build a list of all master devices from all documents
|
<< endmsg;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
_documents[device->first] = document;
|
||||||
_master_devices_by_model[device->first] = device->second;
|
_master_devices_by_model[device->first] = device->second;
|
||||||
_all_models.insert(device->first);
|
|
||||||
|
|
||||||
// make sure there are no double model names
|
_all_models.insert(device->first);
|
||||||
// TODO: handle this gracefully.
|
|
||||||
assert(_documents.count(device->first) == 1);
|
|
||||||
assert(_master_devices_by_model.count(device->first) == 1);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user