1
0
mirror of https://github.com/cookiengineer/audacity synced 2026-03-06 14:35:32 +01:00

Part 2 of fix from r13782 and monitoring fix

This fixes the monitoring fix Bill described here:

http://audacity.238276.n2.nabble.com/First-go-at-the-meter-toolbars-committed-tp7566196p7566209.html
This commit is contained in:
lllucius
2014-12-18 08:00:18 +00:00
parent 64afdbb508
commit d978d99fde

View File

@@ -486,10 +486,13 @@ void Meter::SetStyle(Meter::Style newStyle)
// MixerTrackCluster disallows style change.
if (mStyle == MixerTrackCluster)
return;
mStyle = newStyle;
gPrefs->Write(wxT("/Meter/MeterStyle"), newStyle == Meter::HorizontalStereo ? wxT("HorizontalStereo") : wxT("VerticalStereo"));
mLayoutValid = false;
Refresh(true);
if (mStyle != newStyle)
{
mStyle = newStyle;
gPrefs->Write(wxT("/Meter/MeterStyle"), newStyle == Meter::HorizontalStereo ? wxT("HorizontalStereo") : wxT("VerticalStereo"));
mLayoutValid = false;
Refresh(true);
}
}
void Meter::Reset(double sampleRate, bool resetClipping)
@@ -1447,7 +1450,7 @@ void Meter::StartMonitoring()
}
}
if (start){
if (start && !gAudioIO->IsBusy()){
if (mMeterDisabled){
wxCommandEvent dummy;
OnDisableMeter(dummy);