ardour/livetrax
13
0
Fork 0
Code

Set MIDI device model to "Generic" by default (previously was unset).

Browse Source 
Perhaps it should be "Standard MIDI" though?


git-svn-id: svn://localhost/ardour2/branches/3.0@13900 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2013-01-19 19:06:21 +00:00
parent fe980b5c99
commit cc8b42f167
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gtk2_ardour/midi_time_axis.cc
View File

@ -148,6 +148,7 @@ MidiTimeAxisView::set_route (boost::shared_ptr<Route> rt)
atoi (gui_property ("note-range-max").c_str()), atoi (gui_property ("note-range-max").c_str()),
true); true);
} }
midi_view()->NoteRangeChanged.connect ( midi_view()->NoteRangeChanged.connect (
sigc::mem_fun (*this, &MidiTimeAxisView::note_range_changed)); sigc::mem_fun (*this, &MidiTimeAxisView::note_range_changed));
_view->ContentsHeightChanged.connect ( _view->ContentsHeightChanged.connect (
@ -226,6 +227,10 @@ MidiTimeAxisView::set_route (boost::shared_ptr<Route> rt)
_midnam_model_selector.append_text(m->c_str()); _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_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"))); _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_size_request(10, 30);
_midnam_custom_device_mode_selector.set_border_width(2); _midnam_custom_device_mode_selector.set_border_width(2);
_midnam_custom_device_mode_selector.show (); _midnam_custom_device_mode_selector.show ();
_midi_controls_box.attach(_midnam_custom_device_mode_selector, 0, 1, 3, 4); _midi_controls_box.attach(_midnam_custom_device_mode_selector, 0, 1, 3, 4);
} else { } else {
_midi_controls_box.attach(_channel_selector, 0, 1, 0, 1); _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( _midnam_custom_device_mode_selector.signal_changed().connect(
sigc::mem_fun(*this, &MidiTimeAxisView::custom_device_mode_changed)); sigc::mem_fun(*this, &MidiTimeAxisView::custom_device_mode_changed));
controls_vbox.pack_start(_midi_controls_box, false, false); controls_vbox.pack_start(_midi_controls_box, false, false);
// restore channel selector settings // restore channel selector settings