ardour/livetrax
13
0
Fork 0
Code

Remove panner altogether, if necessary, when setting up PannerUI. Also reset a mixer strip's peak display when its route is changed (#4485).

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@10668 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-11-18 00:22:31 +00:00
parent 12e80812fd
commit 5cb4efea80
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/mixer_strip.cc
View File

@ -545,6 +545,8 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
hide_button.show();
}
gpm.reset_peak_display ();
width_button.show();
width_hide_box.show();
whvbox.show ();

14
gtk2_ardour/panner_ui.cc
View File

@ -219,14 +219,10 @@ PannerUI::panshell_changed ()
void
PannerUI::setup_pan ()
{
if (!_panner) {
return;
}
int const nouts = _panner ? _panner->out().n_audio() : -1;
int const nins = _panner ? _panner->in().n_audio() : -1;
uint32_t const nouts = _panner->out().n_audio();
uint32_t const nins = _panner->in().n_audio();
if (int32_t (nouts) == _current_nouts && int32_t (nins) == _current_nins) {
if (nouts == _current_nouts && nins == _current_nins) {
return;
}
@ -242,6 +238,10 @@ PannerUI::setup_pan ()
delete _mono_panner;
_mono_panner = 0;
if (!_panner) {
return;
}
if (nouts == 0 || nouts == 1) {
/* stick something into the panning viewport so that it redraws */