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

Support note names from midnam files (tested with the DM5).

Browse source 
Do this via a simple MasterDeviceNames::note_name() function.  The same really
needs to be done for program names, this stuff is absolutely brutal to use.

Store note names in a vector indexed by number instead of a list with string
"numbers" for reasonable lookup time.

Make some references const that should be.


git-svn-id: svn://localhost/ardour2/branches/3.0@13908 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2013-01-20 00:46:55 +00:00
parent 448c156b4b
commit 88de45b7cc
6 changed files with 173 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

27
gtk2_ardour/midi_time_axis.cc
View file

@ -232,8 +232,7 @@ MidiTimeAxisView::set_route (boost::shared_ptr<Route> rt)
}
if (gui_property (X_("midnam-custom-device-mode")).empty()) {
boost::shared_ptr<MIDI::Name::MasterDeviceNames> device_names = get_device_names(
gui_property (X_("midnam-model-name")));
boost::shared_ptr<MIDI::Name::MasterDeviceNames> device_names = get_device_names();
if (device_names) {
set_gui_property (X_("midnam-custom-device-mode"),
*device_names->custom_device_mode_names().begin());
@ -760,10 +759,27 @@ MidiTimeAxisView::add_multi_channel_controller_item(Menu_Helpers::MenuList& ctl_
dynamic_cast<Label*> (ctl_items.back().get_child())->set_use_markup (true);
}
boost::shared_ptr<MIDI::Name::MasterDeviceNames>
MidiTimeAxisView::get_device_names(const std::string& model)
boost::shared_ptr<MIDI::Name::CustomDeviceMode>
MidiTimeAxisView::get_device_mode()
{
using namespace MIDI::Name;
boost::shared_ptr<MasterDeviceNames> device_names = get_device_names();
if (!device_names) {
return boost::shared_ptr<MIDI::Name::CustomDeviceMode>();
}
return device_names->custom_device_mode_by_name(
gui_property (X_("midnam-custom-device-mode")));
}
boost::shared_ptr<MIDI::Name::MasterDeviceNames>
MidiTimeAxisView::get_device_names()
{
using namespace MIDI::Name;
const std::string model = gui_property (X_("midnam-model-name"));
boost::shared_ptr<MIDINameDocument> midnam = MidiPatchManager::instance()
.document_by_model(model);
if (midnam) {
@ -807,8 +823,7 @@ MidiTimeAxisView::build_controller_menu ()
}
using namespace MIDI::Name;
boost::shared_ptr<MasterDeviceNames> device_names = get_device_names(
_midnam_model_selector.get_active_text());
boost::shared_ptr<MasterDeviceNames> device_names = get_device_names();
if (device_names && !device_names->controls().empty()) {
/* Controllers names available in midnam file, generate fancy menu */