fix initial conditions

dweymouth · Jul 23, 2024 · fdeb33f · fdeb33f
1 parent 4d635d8
commit fdeb33f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/ui/controller/visualizations.go b/ui/controller/visualizations.go
@@ -6,6 +6,7 @@ import (
 
 	"fyne.io/fyne/v2"
 	"fyne.io/fyne/v2/lang"
+	"github.com/dweymouth/supersonic/backend/player"
 	"github.com/dweymouth/supersonic/ui/util"
 	"github.com/dweymouth/supersonic/ui/visualizations"
 )
@@ -47,7 +48,12 @@ func (c *Controller) ShowPeakMeter() {
 	}
 	c.peakMeter = visualizations.NewPeakMeter()
 	win.SetContent(c.peakMeter)
-	c.startVisualizationAnim()
+	if c.App.LocalPlayer.GetStatus().State == player.Playing {
+		c.startVisualizationAnim()
+	} else {
+		// TODO: why is this needed?
+		c.peakMeter.Refresh()
+	}
 	win.Show()
 }
 

diff --git a/ui/visualizations/peakmeter.go b/ui/visualizations/peakmeter.go
@@ -17,6 +17,8 @@ const (
 	meterRangeDB       = 62
 	rmsSmoothingFactor = 0.8
 	peakHoldFrames     = 60
+
+	noiseFloorDB = -96
 )
 
 type PeakMeter struct {
@@ -33,7 +35,14 @@ type PeakMeter struct {
 }
 
 func NewPeakMeter() *PeakMeter {
-	p := &PeakMeter{}
+	p := &PeakMeter{
+		lPeak:     noiseFloorDB,
+		rPeak:     noiseFloorDB,
+		lRMS:      noiseFloorDB,
+		rRMS:      noiseFloorDB,
+		lPeakHold: noiseFloorDB,
+		rPeakHold: noiseFloorDB,
+	}
 	p.ExtendBaseWidget(p)
 	return p
 }
@@ -44,8 +53,8 @@ func NewPeakMeter() *PeakMeter {
 func (p *PeakMeter) UpdatePeaks(lPeak, rPeak, lRMS, rRMS float64) {
 	p.lPeak = lPeak
 	p.rPeak = rPeak
-	lRMS = math.Max(-96, lRMS)
-	rRMS = math.Max(-96, rRMS)
+	lRMS = math.Max(noiseFloorDB, lRMS)
+	rRMS = math.Max(noiseFloorDB, rRMS)
 	p.lRMS = rmsSmoothingFactor*p.lRMS + (1-rmsSmoothingFactor)*lRMS
 	p.rRMS = rmsSmoothingFactor*p.rRMS + (1-rmsSmoothingFactor)*rRMS
 
@@ -99,6 +108,7 @@ func newPeakMeterRenderer(pm *PeakMeter) *peakMeterRenderer {
 		p.rulerLabels[i].Resize(p.rulerLabels[i].MinSize())
 		x -= 10
 	}
+	p.Layout(pm.Size())
 
 	return p
 }