projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
send a slightly more useful message if a control protocol's probe() method fails
[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 8233f06353beeddf01bb455a863140ad5d5d014c..8a6d8dfd100a5a88be14a8bfc47b6cb076b5e250 100644
(file)
--- a/
libs/ardour/midi_patch_manager.cc
+++ b/
libs/ardour/midi_patch_manager.cc
@@
-29,7
+29,7
@@
#include "ardour/search_paths.h"
#include "ardour/search_paths.h"
-#include "i18n.h"
+#include "
pbd/
i18n.h"
using namespace std;
using namespace ARDOUR;
using namespace std;
using namespace ARDOUR;
@@
-74,7
+74,9
@@
MidiPatchManager::add_midnam_files_from_directory(const std::string& directory_p
vector<std::string> result;
find_files_matching_pattern (result, directory_path, "*.midnam");
vector<std::string> result;
find_files_matching_pattern (result, directory_path, "*.midnam");
- info << "Loading " << result.size() << " MIDI patches from " << directory_path
+ 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) {
<< endmsg;
for (vector<std::string>::const_iterator i = result.begin(); i != result.end(); ++i) {
@@
-103,8
+105,10
@@
MidiPatchManager::remove_midnam_files_from_directory(const std::string& director
vector<std::string> result;
find_files_matching_pattern (result, directory_path, "*.midnam");
vector<std::string> result;
find_files_matching_pattern (result, directory_path, "*.midnam");
- info << "Unloading " << result.size() << " MIDI patches from "
- << directory_path << endmsg;
+ 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);
for (vector<std::string>::const_iterator i = result.begin(); i != result.end(); ++i) {
remove_midi_name_document (*i);
@@
-119,7
+123,8
@@
MidiPatchManager::add_midi_name_document (const std::string& file_path)
document = boost::shared_ptr<MIDINameDocument>(new MIDINameDocument(file_path));
}
catch (...) {
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 =
return false;
}
for (MIDINameDocument::MasterDeviceNamesList::const_iterator device =
@@
-162,6
+167,8
@@
MidiPatchManager::remove_midi_name_document (const std::string& file_path)
boost::shared_ptr<MIDINameDocument> document = i->second;
boost::shared_ptr<MIDINameDocument> document = i->second;
+ info << string_compose(_("Removing MIDI patch file %1"), file_path) << endmsg;
+
_documents.erase(i++);
for (MIDINameDocument::MasterDeviceNamesList::const_iterator device =
_documents.erase(i++);
for (MIDINameDocument::MasterDeviceNamesList::const_iterator device =