diff options
Diffstat (limited to 'gtk2_ardour/midi_time_axis.cc')
| -rw-r--r-- | gtk2_ardour/midi_time_axis.cc | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc index 9a4200b4af..a8960663e4 100644 --- a/gtk2_ardour/midi_time_axis.cc +++ b/gtk2_ardour/midi_time_axis.cc @@ -201,7 +201,6 @@ MidiTimeAxisView::set_route (boost::shared_ptr<Route> rt) } } - HBox* midi_controls_hbox = manage(new HBox()); MIDI::Name::MidiPatchManager& patch_manager = MIDI::Name::MidiPatchManager::instance(); @@ -222,15 +221,20 @@ MidiTimeAxisView::set_route (boost::shared_ptr<Route> rt) ARDOUR_UI::instance()->set_tip (_model_selector, _("External MIDI Device")); ARDOUR_UI::instance()->set_tip (_custom_device_mode_selector, _("External Device Mode")); - midi_controls_hbox->pack_start(_channel_selector, true, false); + _midi_controls_box.set_homogeneous(false); + if (!patch_manager.all_models().empty()) { + _midi_controls_box.resize(3, 3); _midi_controls_box.set_border_width (5); - _midi_controls_box.pack_start(_model_selector, true, false); - _midi_controls_box.pack_start(_custom_device_mode_selector, true, false); + _midi_controls_box.attach(_channel_selector, 1, 2, 0, 1); + _midi_controls_box.attach(*(new Label(" ", false)), 0, 1, 1, 2); + _midi_controls_box.attach(*(new Label(" ", false)), 2, 3, 1, 2); + _midi_controls_box.attach(_model_selector, 1, 2, 1, 2); + _midi_controls_box.attach(_custom_device_mode_selector, 1, 2, 2, 3); + } else { + _midi_controls_box.attach(_channel_selector, 1, 2, 0, 1); } - _midi_controls_box.pack_start(*midi_controls_hbox, true, true); - controls_vbox.pack_start(_midi_controls_box, false, false); // restore channel selector settings |