From cbdf686e391bc2e7b93f37a5d3fa9197cb178078 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 11 Aug 2006 07:15:30 +0000 Subject: - Replaced integer port counts (and input/output maximum/minimum) with ChanCount, which can count multiple types and does the reasonable thing for all comparison operators - Removed the fader/meters from MIDI mixer strips, at least until they do something - Made the Add Route dialog refuse to create MIDI busses, Spifftacular warning dialog and all Changes a bit more widespread than I was hoping, but worked out really well - lots of code will continue to work fine even when multi-typed (eg instrument) IOs come around, just ignoring the types it doesn't care about. Most all changes related to counts are little search/replace deals, logic doesn't need to change. Hopefully SVN can handle (automatic) merging with the other SoC projects if the buffer change goes as well. Next step: do for buffers what the last two commits did for ports. git-svn-id: svn://localhost/ardour2/branches/midi@787 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/panner_ui.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gtk2_ardour/panner_ui.cc') diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc index ccce2ec9f1..250f1e146e 100644 --- a/gtk2_ardour/panner_ui.cc +++ b/gtk2_ardour/panner_ui.cc @@ -276,7 +276,7 @@ PannerUI::update_pan_state () void PannerUI::setup_pan () { - uint32_t nouts = _io->n_outputs (); + uint32_t nouts = _io->n_outputs ().get(ARDOUR::DataType::AUDIO); if (nouts == 0 || nouts == 1) { @@ -375,7 +375,7 @@ PannerUI::setup_pan () } update_pan_sensitive (); - panner->reset (_io->n_inputs()); + panner->reset (_io->n_inputs().get(ARDOUR::DataType::AUDIO)); panner->set_size_request (w, 61); /* and finally, add it to the panner frame */ @@ -462,7 +462,7 @@ PannerUI::effective_pan_display () return; } - switch (_io->n_outputs()) { + switch (_io->n_outputs().get(ARDOUR::DataType::AUDIO)) { case 0: case 1: /* relax */ @@ -473,7 +473,7 @@ PannerUI::effective_pan_display () break; default: - //panner->move_puck (pan_value (v, right), 0.5); + //panner->move_puck (pan_value (v, right), 0.5); break; } } @@ -499,7 +499,7 @@ PannerUI::pan_changed (void *src) panning_link_button.set_sensitive (true); } - uint32_t nouts = _io->n_outputs(); + uint32_t nouts = _io->n_outputs().get(ARDOUR::DataType::AUDIO); switch (nouts) { case 0: @@ -556,7 +556,7 @@ PannerUI::pan_value_changed (uint32_t which) { ENSURE_GUI_THREAD (bind (mem_fun(*this, &PannerUI::pan_value_changed), which)); - if (_io->n_outputs() > 1 && which < _io->panner().size()) { + if (_io->n_outputs().get(ARDOUR::DataType::AUDIO) > 1 && which < _io->panner().size()) { float xpos; float val = pan_adjustments[which]->get_value (); @@ -626,7 +626,7 @@ PannerUI::update_pan_sensitive () { bool sensitive = !(_io->panner().automation_state() & Play); - switch (_io->n_outputs()) { + switch (_io->n_outputs().get(ARDOUR::DataType::AUDIO)) { case 0: case 1: break; -- cgit v1.2.3