X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_patch_manager.cc;h=133f4ee7f81946e8f93ba10897d2ae8c2577aa7d;hb=bc0bb9662e939c1b37f4335c05292a7b0ad21a20;hp=8233f06353beeddf01bb455a863140ad5d5d014c;hpb=e93ba5330903ad3ff03da4abe88a0a09ec408df7;p=ardour.git diff --git a/libs/ardour/midi_patch_manager.cc b/libs/ardour/midi_patch_manager.cc index 8233f06353..133f4ee7f8 100644 --- a/libs/ardour/midi_patch_manager.cc +++ b/libs/ardour/midi_patch_manager.cc @@ -74,7 +74,9 @@ MidiPatchManager::add_midnam_files_from_directory(const std::string& directory_p vector 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::const_iterator i = result.begin(); i != result.end(); ++i) { @@ -103,8 +105,10 @@ MidiPatchManager::remove_midnam_files_from_directory(const std::string& director vector 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::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(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 = @@ -162,6 +167,8 @@ MidiPatchManager::remove_midi_name_document (const std::string& file_path) boost::shared_ptr document = i->second; + info << string_compose(_("Removing MIDI patch file %1"), file_path) << endmsg; + _documents.erase(i++); for (MIDINameDocument::MasterDeviceNamesList::const_iterator device =