allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

more cleanup of crazy (?) stuff regarding gain display and peak display in GainMeter/MixerStrips

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@13960 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis
2013-01-21 22:27:39 +00:00
parent eabf3c31ed
commit 2debe51993
2 changed files with 10 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gtk2_ardour/gain_meter.cc
View File

@@ -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()) {

28
gtk2_ardour/mixer_strip.cc
View File

@@ -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: