ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Consolidate MIDNAM control display code

Browse Source
This commit is contained in:
Robin Gareus 2020-04-01 23:26:13 +02:00
parent 20ee430fda
commit 42af08fb92
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gtk2_ardour/midi_time_axis.cc
View File

@ -953,11 +953,10 @@ MidiTimeAxisView::build_controller_menu ()
}
}
// XXX -> InstrumentInfo::master_control_names ()
using namespace MIDI::Name;
boost::shared_ptr<MasterDeviceNames> device_names = _route->instrument_info().master_device_names ();
size_t total_ctrls = _route->instrument_info().master_controller_count ();
if (total_ctrls > 0) {
using namespace MIDI::Name;
if (device_names && !device_names->controls().empty()) {
/* Controllers names available in midnam file, generate fancy menu */
unsigned n_items = 0;
unsigned n_groups = 0;
@ -966,13 +965,7 @@ MidiTimeAxisView::build_controller_menu ()
uint16_t ctl_start = 1;
uint16_t ctl_end = 1;
MasterDeviceNames::ControlNameLists const& ctllist (device_names->controls());
size_t total_ctrls = 0;
for (MasterDeviceNames::ControlNameLists::const_iterator l = ctllist.begin(); l != ctllist.end(); ++l) {
boost::shared_ptr<ControlNameList> name_list = l->second;
total_ctrls += name_list->controls().size();
}
MasterDeviceNames::ControlNameLists const& ctllist (_route->instrument_info().master_device_names ()->controls ());
bool to_top_level = total_ctrls < 32;
@ -1192,10 +1185,8 @@ MidiTimeAxisView::show_all_automation (bool apply_to_selection)
create_automation_child(*i, true);
}
// Show automation for all controllers named in midnam file
boost::shared_ptr<MasterDeviceNames> device_names = _route->instrument_info().master_device_names (); // XXX
if (/*gui_property (X_("midnam-model-name")) != DEFAULT_MIDNAM_MODEL && */ device_names && !device_names->controls().empty()) {
/* Show automation for all controllers named in midnam file */
if (_route->instrument_info().master_controller_count () > 0) {
const uint16_t selected_channels = midi_track()->get_playback_channel_mask();