diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-06-11 12:07:17 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-06-11 12:07:17 +0000 |
| commit | 960de7306f8573f6cb698cf031fad46daa3c741d (patch) | |
| tree | 690e6312cbe1d25bfe3845cdd578b6c864d83ab8 /gtk2_ardour/midi_time_axis.cc | |
| parent | 80afb6e08b52f05d672df2d991265df713792010 (diff) | |
partially-done (but compile-friendly) move of instrument info into a new backend object
git-svn-id: svn://localhost/ardour2/branches/3.0@12652 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/midi_time_axis.cc')
| -rw-r--r-- | gtk2_ardour/midi_time_axis.cc | 37 |
1 files changed, 3 insertions, 34 deletions
diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc index e8a2b1faff..4678ea7c7b 100644 --- a/gtk2_ardour/midi_time_axis.cc +++ b/gtk2_ardour/midi_time_axis.cc @@ -317,15 +317,14 @@ MidiTimeAxisView::model_changed() } _custom_device_mode_selector.set_active(0); - - set_gui_property (X_("midnam-model-name"), midi_patch_model ()); + + _route->instrument_info().set_external_instrument (_model_selector.get_active_text(), _custom_device_mode_selector.get_active_text()); } void MidiTimeAxisView::custom_device_mode_changed() { - _midi_patch_settings_changed.emit (midi_patch_model (), midi_patch_custom_device_mode ()); - set_gui_property (X_("midnam-custom-device-mode"), midi_patch_custom_device_mode ()); + _route->instrument_info().set_external_instrument (_model_selector.get_active_text(), _custom_device_mode_selector.get_active_text()); } MidiStreamView* @@ -1207,33 +1206,3 @@ MidiTimeAxisView::note_range_changed () set_gui_property ("note-range-max", (int) midi_view()->highest_note ()); } -string -MidiTimeAxisView::midi_patch_model () const -{ - return _model_selector.get_active_text (); -} - -string -MidiTimeAxisView::midi_patch_custom_device_mode () const -{ - return _custom_device_mode_selector.get_active_text (); -} - -string -MidiTimeAxisView::get_patch_name (uint16_t bank, uint8_t program, uint8_t channel) const -{ - MIDI::Name::PatchPrimaryKey patch_key (bank, program); - - boost::shared_ptr<MIDI::Name::Patch> patch = - MIDI::Name::MidiPatchManager::instance().find_patch (midi_patch_model(), midi_patch_custom_device_mode(), channel, patch_key); - - if (patch) { - return patch->name(); - } else { - /* program and bank numbers are zero-based: convert to one-based: MIDI_BP_ZERO */ - -#define MIDI_BP_ZERO ((Config->get_first_midi_bank_is_zero())?0:1) - - return string_compose ("%1 %2",program + MIDI_BP_ZERO , bank + MIDI_BP_ZERO); - } -} |