diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-01-21 22:27:39 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-01-21 22:27:39 +0000 |
| commit | 2debe51993a078f9a87db119db9d6071216999f5 (patch) | |
| tree | 6e013392126a434aee61f96fecac43f6e1fbdbd8 /gtk2_ardour | |
| parent | eabf3c31ed5337c704a0433cf2b217819fb2ffba (diff) | |
more cleanup of crazy (?) stuff regarding gain display and peak display in GainMeter/MixerStrips
git-svn-id: svn://localhost/ardour2/branches/3.0@13960 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/gain_meter.cc | 5 | ||||
| -rw-r--r-- | gtk2_ardour/mixer_strip.cc | 28 |
2 files changed, 10 insertions, 23 deletions
diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index 23b62b4a41..6c241ac4a5 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -904,10 +904,6 @@ GainMeter::set_controls (boost::shared_ptr<Route> r, hbox.remove (meter_alignment); } - if (peak_display.get_parent()) { - peak_display.get_parent()->remove (peak_display); - } - // if (gain_automation_state_button.get_parent()) { // fader_vbox->remove (gain_automation_state_button); // } @@ -928,7 +924,6 @@ GainMeter::set_controls (boost::shared_ptr<Route> r, pack some route-dependent stuff. */ - gain_display_box.pack_end (peak_display, true, true); hbox.pack_start (meter_alignment, true, true); // if (r && !r->is_hidden()) { diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 108d828a21..a8ac81f770 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -400,13 +400,19 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt) revert_to_default_display (); - if (gpm.gain_display.get_parent()) { - gpm.gain_display.get_parent()->remove (gpm.gain_display); - } - + /* 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); if (solo_button->get_parent()) { middle_button_table.remove (*solo_button); @@ -603,20 +609,6 @@ 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: |