smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-24 07:27:44 +01:00
Code Issues Projects Releases Wiki Activity

Change PBD::PathScanner API to return results by value to avoid inadvertent memory leaks

Browse source 
Conflicts:
	gtk2_ardour/session_dialog.cc
This commit is contained in:
Tim Mayberry 2014-06-16 20:39:45 +10:00 • committed by Paul Davis
parent 69b3c622c5
commit ae22d60a42
13 changed files with 198 additions and 310 deletions
Download patch file Download diff file Expand all files Collapse all files

10
libs/surfaces/generic_midi/generic_midi_control_protocol.cc
View file

@ -136,20 +136,20 @@ midi_map_filter (const string &str, void* /*arg*/)
void
GenericMidiControlProtocol::reload_maps ()
{
vector<string *> *midi_maps;
vector<string> midi_maps;
PathScanner scanner;
Searchpath spath (system_midi_map_search_path());
spath += user_midi_map_directory ();
midi_maps = scanner (spath.to_string(), midi_map_filter, 0, false, true);
if (!midi_maps) {
if (midi_maps.empty()) {
cerr << "No MIDI maps found using " << spath.to_string() << endl;
return;
}
for (vector<string*>::iterator i = midi_maps->begin(); i != midi_maps->end(); ++i) {
string fullpath = *(*i);
for (vector<string>::iterator i = midi_maps.begin(); i != midi_maps.end(); ++i) {
string fullpath = *i;
XMLTree tree;
@ -170,8 +170,6 @@ GenericMidiControlProtocol::reload_maps ()
map_info.push_back (mi);
}
delete midi_maps;
}
void