diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2020-02-07 12:19:01 -0700 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2020-02-07 12:20:11 -0700 |
| commit | e93150cb3f337e70b1da4481ae0f3001e4ed66cd (patch) | |
| tree | af457d6f18f19da80cf0d399d53348e916f396a1 /gtk2_ardour/midi_time_axis.cc | |
| parent | 40cca52bbb047720b7f448759fbde56a298d8a8e (diff) | |
NOOP: remove line wrapping
Diffstat (limited to 'gtk2_ardour/midi_time_axis.cc')
| -rw-r--r-- | gtk2_ardour/midi_time_axis.cc | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc index 19d2c892d5..7c7ef7b350 100644 --- a/gtk2_ardour/midi_time_axis.cc +++ b/gtk2_ardour/midi_time_axis.cc @@ -263,8 +263,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(); if (device_names) { - set_gui_property (X_("midnam-custom-device-mode"), - *device_names->custom_device_mode_names().begin()); + set_gui_property (X_("midnam-custom-device-mode"), *device_names->custom_device_mode_names().begin()); } } @@ -486,12 +485,8 @@ MidiTimeAxisView::model_changed(const std::string& model) } _midnam_custom_device_mode_selector.clear_items(); - for (std::list<std::string>::const_iterator i = device_modes.begin(); - i != device_modes.end(); ++i) { - _midnam_custom_device_mode_selector.AddMenuElem( - Gtk::Menu_Helpers::MenuElem( - *i, sigc::bind(sigc::mem_fun(*this, &MidiTimeAxisView::custom_device_mode_changed), - *i))); + for (std::list<std::string>::const_iterator i = device_modes.begin(); i != device_modes.end(); ++i) { + _midnam_custom_device_mode_selector.AddMenuElem (Gtk::Menu_Helpers::MenuElem(*i, sigc::bind(sigc::mem_fun(*this, &MidiTimeAxisView::custom_device_mode_changed), *i))); } if (!device_modes.empty()) { @@ -920,12 +915,12 @@ 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"))); + return device_names->custom_device_mode_by_name(gui_property (X_("midnam-custom-device-mode"))); } boost::shared_ptr<MIDI::Name::MasterDeviceNames> |