diff options
| author | David Robillard <d@drobilla.net> | 2006-07-14 03:43:32 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-07-14 03:43:32 +0000 |
| commit | 50a3102b9b533d7f8786d220f8df67421b9227c8 (patch) | |
| tree | 669f84631ba1d9a1d312e3f76b226ca938c75c0f /gtk2_ardour/panner_ui.cc | |
| parent | edd841895b873b14c4aa814a80de5dc20ff30618 (diff) | |
Merge big changes (mostly Controllable) from trunk
git-svn-id: svn://localhost/ardour2/branches/midi@682 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/panner_ui.cc')
| -rw-r--r-- | gtk2_ardour/panner_ui.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc index 63a19867a8..fac92a2844 100644 --- a/gtk2_ardour/panner_ui.cc +++ b/gtk2_ardour/panner_ui.cc @@ -316,13 +316,9 @@ PannerUI::setup_pan () _io.panner()[asz]->Changed.connect (bind (mem_fun(*this, &PannerUI::pan_value_changed), (uint32_t) asz)); bc = new BarController (*pan_adjustments[asz], - &_io.panner()[asz]->midi_control(), + _io.panner()[asz]->control(), bind (mem_fun(*this, &PannerUI::pan_printer), pan_adjustments[asz])); - if (_session.midi_port()) { - _io.panner()[asz]->reset_midi_control (_session.midi_port(), true); - } - bc->set_name ("PanSlider"); bc->set_shadow_type (Gtk::SHADOW_NONE); bc->set_style (BarController::Line); |