diff options
| author | David Robillard <d@drobilla.net> | 2006-08-11 07:15:30 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-08-11 07:15:30 +0000 |
| commit | cbdf686e391bc2e7b93f37a5d3fa9197cb178078 (patch) | |
| tree | 455b52d56b02b90444cd1c39f3ddcb703ca30e10 /gtk2_ardour/gain_meter.cc | |
| parent | 30c08ba655330232767554c48bda1975bfb5628c (diff) | |
- 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
Diffstat (limited to 'gtk2_ardour/gain_meter.cc')
| -rw-r--r-- | gtk2_ardour/gain_meter.cc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index 5fa8c462bc..ea7663da8a 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -141,13 +141,16 @@ GainMeter::GainMeter (boost::shared_ptr<IO> io, Session& s) gain_automation_state_button.set_size_request(15, 15); gain_automation_style_button.set_size_request(15, 15); + fader_vbox = manage (new Gtk::VBox()); fader_vbox->set_spacing (0); fader_vbox->pack_start (*gain_slider, false, false, 0); hbox.set_spacing (0); - hbox.pack_start (*fader_vbox, false, false, 2); + if (_io->default_type() == ARDOUR::DataType::AUDIO) + hbox.pack_start (*fader_vbox, false, false, 2); + set_width(Narrow); Route* r; @@ -382,7 +385,7 @@ GainMeter::hide_all_meters () void GainMeter::setup_meters () { - uint32_t nmeters = _io->n_outputs(); + uint32_t nmeters = _io->n_outputs().get(DataType::AUDIO); guint16 width; hide_all_meters (); @@ -394,16 +397,16 @@ GainMeter::setup_meters () switch (r->meter_point()) { case MeterPreFader: case MeterInput: - nmeters = r->n_inputs(); + nmeters = r->n_inputs().get(DataType::AUDIO); break; case MeterPostFader: - nmeters = r->n_outputs(); + nmeters = r->n_outputs().get(DataType::AUDIO); break; } } else { - nmeters = _io->n_outputs(); + nmeters = _io->n_outputs().get(DataType::AUDIO); } |