diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-01-21 14:24:57 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-01-21 14:24:57 +0000 |
| commit | dabd5bd174a6fc9cb529fe7c4fdffe726799f594 (patch) | |
| tree | ab3342321cffb2e5e84474614dc19c460707edff /gtk2_ardour/mixer_strip.cc | |
| parent | 7a2f3e63803802922ec4f3e565854177f1470bff (diff) | |
fix/revert/modify changes from 13617 that hide the gain + peak display from a generic GainMeter; name import dialog preview fader (fixes 5288)
git-svn-id: svn://localhost/ardour2/branches/3.0@13947 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/mixer_strip.cc')
| -rw-r--r-- | gtk2_ardour/mixer_strip.cc | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 0f1d78d5bf..108d828a21 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -401,11 +401,11 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt) revert_to_default_display (); if (gpm.gain_display.get_parent()) { - middle_button_table.remove (gpm.gain_display); + gpm.gain_display.get_parent()->remove (gpm.gain_display); } if (gpm.peak_display.get_parent()) { - middle_button_table.remove (gpm.peak_display); + gpm.peak_display.get_parent()->remove (gpm.peak_display); } if (solo_button->get_parent()) { @@ -603,17 +603,22 @@ MixerStrip::set_width_enum (Width w, void* owner) set_button_names (); + /* unpack these from the parent and stuff them into our own + table + */ + + if (gpm.peak_display.get_parent()) { + gpm.peak_display.get_parent()->remove (gpm.peak_display); + } + if (gpm.gain_display.get_parent()) { + gpm.gain_display.get_parent()->remove (gpm.gain_display); + } + + middle_button_table.attach (gpm.gain_display,0,1,1,2); + middle_button_table.attach (gpm.peak_display,1,2,1,2); + switch (w) { case Wide: - if (!gpm.peak_display.get_parent()) { - middle_button_table.attach (gpm.peak_display,1,2,1,2); - } - if (gpm.gain_display.get_parent()) { - middle_button_table.remove (gpm.gain_display); - } - if (!gpm.gain_display.get_parent()) { - middle_button_table.attach (gpm.gain_display,0,1,1,2); - } if (show_sends_button) { show_sends_button->set_text (_("Aux\nSends")); @@ -640,16 +645,6 @@ MixerStrip::set_width_enum (Width w, void* owner) break; case Narrow: - if (gpm.peak_display.get_parent()) { - middle_button_table.remove (gpm.peak_display); - } - - if (gpm.gain_display.get_parent()) { - middle_button_table.remove (gpm.gain_display); - } - if (!gpm.gain_display.get_parent()) { - middle_button_table.attach (gpm.gain_display,0,2,1,2); - } if (show_sends_button) { show_sends_button->set_text (_("Snd")); |