diff options
| author | David Robillard <d@drobilla.net> | 2013-01-19 19:06:21 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2013-01-19 19:06:21 +0000 |
| commit | cc8b42f167e4ca997e65f0e07c213d1f3657c890 (patch) | |
| tree | 7421fe5642bd40840e362e873216c62ae7401cd1 /gtk2_ardour | |
| parent | fe980b5c995648c73ecbe1b4b9a71595c6a3327b (diff) | |
Set MIDI device model to "Generic" by default (previously was unset).
Perhaps it should be "Standard MIDI" though?
git-svn-id: svn://localhost/ardour2/branches/3.0@13900 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/midi_time_axis.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc index 54f883ac19..973bbb77e5 100644 --- a/gtk2_ardour/midi_time_axis.cc +++ b/gtk2_ardour/midi_time_axis.cc @@ -148,6 +148,7 @@ MidiTimeAxisView::set_route (boost::shared_ptr<Route> rt) atoi (gui_property ("note-range-max").c_str()), true); } + midi_view()->NoteRangeChanged.connect ( sigc::mem_fun (*this, &MidiTimeAxisView::note_range_changed)); _view->ContentsHeightChanged.connect ( @@ -226,6 +227,10 @@ MidiTimeAxisView::set_route (boost::shared_ptr<Route> rt) _midnam_model_selector.append_text(m->c_str()); } + if (gui_property (X_("midnam-model-name")).empty()) { + set_gui_property (X_("midnam-model-name"), "Generic"); + } + _midnam_model_selector.set_active_text (gui_property (X_("midnam-model-name"))); _midnam_custom_device_mode_selector.set_active_text (gui_property (X_("midnam-custom-device-mode"))); @@ -252,6 +257,7 @@ MidiTimeAxisView::set_route (boost::shared_ptr<Route> rt) _midnam_custom_device_mode_selector.set_size_request(10, 30); _midnam_custom_device_mode_selector.set_border_width(2); _midnam_custom_device_mode_selector.show (); + _midi_controls_box.attach(_midnam_custom_device_mode_selector, 0, 1, 3, 4); } else { _midi_controls_box.attach(_channel_selector, 0, 1, 0, 1); @@ -266,7 +272,6 @@ MidiTimeAxisView::set_route (boost::shared_ptr<Route> rt) _midnam_custom_device_mode_selector.signal_changed().connect( sigc::mem_fun(*this, &MidiTimeAxisView::custom_device_mode_changed)); - controls_vbox.pack_start(_midi_controls_box, false, false); // restore channel selector settings |