#include <boost/shared_ptr.hpp>
-#include "pbd/compose.h"
+#include <glibmm/fileutils.h>
+
#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/midi_patch_search_path.h"
+
+#include "ardour/search_paths.h"
#include "i18n.h"
using namespace MIDI;
using namespace MIDI::Name;
using namespace PBD;
-using namespace PBD::sys;
MidiPatchManager* MidiPatchManager::_manager = 0;
MidiPatchManager::set_session (Session* s)
{
SessionHandlePtr::set_session (s);
+ refresh ();
add_session_patches ();
}
return;
}
- path path_to_patches = _session->session_directory().midi_patch_path();
+ std::string path_to_patches = _session->session_directory().midi_patch_path();
- if (!exists (path_to_patches)) {
+ if (!Glib::file_test (path_to_patches, Glib::FILE_TEST_EXISTS)) {
return;
}
- assert(is_directory(path_to_patches));
+ assert (Glib::file_test (path_to_patches, Glib::FILE_TEST_IS_DIR));
- Glib::PatternSpec pattern(string("*.midnam"));
- vector<path> result;
+ 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.to_string() << endmsg;
+ info << "Loading " << result.size() << " MIDI patches from " << path_to_patches << endmsg;
- for (vector<path>::iterator i = result.begin(); i != result.end(); ++i) {
- boost::shared_ptr<MIDINameDocument> document(new MIDINameDocument(i->to_string()));
+ for (vector<std::string>::iterator i = result.begin(); i != result.end(); ++i) {
+ boost::shared_ptr<MIDINameDocument> document(new MIDINameDocument(*i));
for (MIDINameDocument::MasterDeviceNamesList::const_iterator device =
document->master_device_names_by_model().begin();
device != document->master_device_names_by_model().end();
_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);
// make sure there are no double model names
// TODO: handle this gracefully.
_master_devices_by_model.clear();
_all_models.clear();
- SearchPath search_path = midi_patch_search_path ();
- Glib::PatternSpec pattern (string("*.midnam"));
- vector<path> result;
+ 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<path>::iterator i = result.begin(); i != result.end(); ++i) {
- boost::shared_ptr<MIDINameDocument> document(new MIDINameDocument(i->to_string()));
+ for (vector<std::string>::iterator i = result.begin(); i != result.end(); ++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);
}
}
MidiPatchManager::session_going_away ()
{
SessionHandlePtr::session_going_away ();
- refresh ();
+ _documents.clear();
+ _master_devices_by_model.clear();
+ _all_models.clear();
}