ardour/livetrax
13
0
Fork 0
Code

Use a std::set for MIDI device models so the combo is sorted and the user can find things.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@13902 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2013-01-19 19:25:06 +00:00
parent ca41354e46
commit 2d9a15087b
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/ardour/midi_patch_manager.cc
View File

@ -83,7 +83,7 @@ MidiPatchManager::add_session_patches ()
_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.
@ -119,7 +119,7 @@ MidiPatchManager::refresh()
_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.

2
libs/midi++2/midi++/midnam_patch.h
View File

@ -333,7 +333,7 @@ private:
class MasterDeviceNames
{
public:
typedef std::list<std::string> Models;
typedef std::set<std::string> Models;
/// maps name to CustomDeviceMode
typedef std::map<std::string, boost::shared_ptr<CustomDeviceMode> > CustomDeviceModes;
typedef std::list<std::string> CustomDeviceModeNames;

4
libs/midi++2/midnam_patch.cc
View File

@ -490,7 +490,7 @@ MasterDeviceNames::set_state(const XMLTree& tree, const XMLNode&)
assert(contents.size() == 1);
XMLNode * content = *(contents.begin());
assert(content->is_content());
_models.push_back(content->content());
_models.insert(content->content());
}
// CustomDeviceModes
@ -634,7 +634,7 @@ MIDINameDocument::set_state (const XMLTree& tree, const XMLNode&)
std::pair<std::string, boost::shared_ptr<MasterDeviceNames> >
(*model, master_device_names));
_all_models.push_back(*model);
_all_models.insert(*model);
}
}