zero value only for var

Author: noriah

README.md

@@ -19,7 +19,7 @@
 - ALSA (linux FFmpeg)
 - DirectShow (windblows FFmpeg)
 
-*portaudio is difficult on windows, so by default it is disabled on windows.
+*portaudio is difficult on windows. by default it is disabled on windows.
 
 ## it depends on
 
@@ -58,6 +58,9 @@ go install -tags noportaudio
 
 # with portaudio on windows
 go install -tags portonwin
+
+# with fftw3 on windows
+go install -tags fftwonwin
 ```
 
 ## run it

catnip.go

@@ -9,7 +9,7 @@ import (
 	"github.com/noriah/catnip/dsp"
 	"github.com/noriah/catnip/graphic"
 	"github.com/noriah/catnip/input"
-	"github.com/noriah/catnip/visualizer"
+	"github.com/noriah/catnip/processor"
 
 	_ "github.com/noriah/catnip/input/ffmpeg"
 	_ "github.com/noriah/catnip/input/parec"
@@ -32,7 +32,7 @@ var version = "unknown"
 func main() {
 	log.SetFlags(0)
 
-	var cfg = newZeroConfig()
+	cfg := newZeroConfig()
 
 	if doFlags(&cfg) {
 		return
@@ -43,7 +43,7 @@ func main() {
 	chk(catnip(&cfg), "failed to run catnip")
 }
 
-// Catnip starts to draw the visualizer on the termbox screen.
+// Catnip starts to draw the processor on the termbox screen.
 func catnip(cfg *config) error {
 
 	display := &graphic.Display{}
@@ -58,7 +58,7 @@ func catnip(cfg *config) error {
 	inputBuffers := input.MakeBuffers(cfg.channelCount, cfg.sampleSize)
 	// visBuffers := input.MakeBuffers(cfg.channelCount, cfg.sampleSize)
 
-	procConfig := visualizer.Config{
+	procConfig := processor.Config{
 		SampleRate:   cfg.sampleRate,
 		SampleSize:   cfg.sampleSize,
 		ChannelCount: cfg.channelCount,
@@ -68,17 +68,17 @@ func catnip(cfg *config) error {
 		Display:      display,
 	}
 
-	var vis visualizer.Visualizer
+	var vis processor.Processor
 
 	if cfg.useThreaded {
-		vis = visualizer.NewThreaded(procConfig)
+		vis = processor.NewThreaded(procConfig)
 	} else {
-		vis = visualizer.New(procConfig)
+		vis = processor.New(procConfig)
 	}
 
 	// INPUT SETUP
 
-	var backend, err = input.InitBackend(cfg.backend)
+	backend, err := input.InitBackend(cfg.backend)
 	if err != nil {
 		return err
 	}
@@ -174,7 +174,7 @@ func catnip(cfg *config) error {
 // NewZeroConfig returns a zero config
 // it is the "default"
 //
-// nora's defaults:
+// nori's defaults:
 //  - sampleRate: 122880
 //  - sampleSize: 2048
 //  - smoothFactor: 80.15
@@ -198,12 +198,12 @@ func newZeroConfig() config {
 
 func doFlags(cfg *config) bool {
 
-	var parser = flaggy.NewParser(AppName)
+	parser := flaggy.NewParser(AppName)
 	parser.Description = AppDesc
 	parser.AdditionalHelpPrepend = AppSite
 	parser.Version = version
 
-	var listBackendsCmd = flaggy.Subcommand{
+	listBackendsCmd := flaggy.Subcommand{
 		Name:                 "list-backends",
 		ShortName:            "lb",
 		Description:          "list all supported backends",
@@ -212,7 +212,7 @@ func doFlags(cfg *config) bool {
 
 	parser.AttachSubcommand(&listBackendsCmd, 1)
 
-	var listDevicesCmd = flaggy.Subcommand{
+	listDevicesCmd := flaggy.Subcommand{
 		Name:                 "list-devices",
 		ShortName:            "ld",
 		Description:          "list all devices for a backend",
@@ -232,7 +232,7 @@ func doFlags(cfg *config) bool {
 	parser.Int(&cfg.barSize, "bw", "bar", "bar width [1, +Inf)")
 	parser.Int(&cfg.spaceSize, "sw", "space", "space width [0, +Inf)")
 	parser.Int(&cfg.drawType, "dt", "draw", "draw type (1, 2, 3)")
-	parser.Bool(&cfg.useThreaded, "t", "threaded", "use the threaded visualizer")
+	parser.Bool(&cfg.useThreaded, "t", "threaded", "use the threaded processor")
 
 	fg, bg, center := graphic.DefaultStyles().AsUInt16s()
 	parser.UInt16(&fg, "fg", "foreground",
@@ -268,7 +268,7 @@ func doFlags(cfg *config) bool {
 		fmt.Printf("all devices for %q backend. '*' marks default\n", cfg.backend)
 
 		for idx := range devices {
-			var star = ' '
+			star := ' '
 			if defaultDevice != nil && devices[idx].String() == defaultDevice.String() {
 				star = '*'
 			}

config.go

@@ -22,6 +22,8 @@ type config struct {
 	// hiCutFreq float64
 	// SmoothFactor factor of smooth
 	smoothFactor float64
+	// SampleSize is how much we draw. Play with it
+	sampleSize int
 	// FrameRate is the number of frames to draw every second (0 draws it every
 	// perfect sample)
 	frameRate int
@@ -31,8 +33,6 @@ type config struct {
 	barSize int
 	// SpaceSize is the size of spaces, in columns/rows
 	spaceSize int
-	// SampleSiz is how much we draw. Play with it
-	sampleSize int
 	// ChannelCount is the number of channels we want to look at. DO NOT TOUCH
 	channelCount int
 	// Combine determines if we merge streams (stereo -> mono)

dsp/analyzer.go

@@ -11,9 +11,7 @@
 //
 package dsp
 
-import (
-	"math"
-)
+import "math"
 
 type Config struct {
 	SampleRate      float64 // audio sample rate
@@ -47,8 +45,8 @@ type bin struct {
 	// widthFFT int     // fft floor-ceiling index delta
 }
 
-// Frequencies are the dividing frequencies
-var Frequencies = []float64{
+// frequencies are the dividing frequencies
+var frequencies = []float64{
 	// sub sub bass
 	20.0, // 0
 	// sub bass
@@ -140,8 +138,8 @@ func (az *analyzer) Recalculate(binCount int) int {
 
 	az.distribute(binCount)
 
-	var bassCut = az.freqToIdx(Frequencies[2], math.Floor)
-	var fBassCut = float64(bassCut)
+	bassCut := az.freqToIdx(frequencies[2], math.Floor)
+	fBassCut := float64(bassCut)
 
 	// set widths
 	for idx, b := range az.bins[:binCount] {
@@ -160,16 +158,19 @@ func (az *analyzer) Recalculate(binCount int) int {
 	return binCount
 }
 
+// This is some hot garbage.
+// It essentially is a lot of work to just increment from 0 for each next bin.
+// Working on replacing this with a real distribution.
 func (az *analyzer) distribute(bins int) {
-	var lo = Frequencies[1]
-	var hi = math.Min(az.cfg.SampleRate/2, Frequencies[4])
+	lo := frequencies[1]
+	hi := math.Min(az.cfg.SampleRate/2, frequencies[4])
 
-	var loLog = math.Log10(lo)
-	var hiLog = math.Log10(hi)
+	loLog := math.Log10(lo)
+	hiLog := math.Log10(hi)
 
-	var cF = (hiLog - loLog) / float64(bins)
+	cF := (hiLog - loLog) / float64(bins)
 
-	var cCoef = 100.0 / float64(bins+1)
+	cCoef := 100.0 / float64(bins+1)
 
 	for idx := range az.bins[:bins+1] {
 
@@ -193,7 +194,7 @@ func (az *analyzer) distribute(bins int) {
 type mathFunc func(float64) float64
 
 func (az *analyzer) freqToIdx(freq float64, round mathFunc) int {
-	var b = int(round(freq / (az.cfg.SampleRate / float64(az.cfg.SampleSize))))
+	b := int(round(freq / (az.cfg.SampleRate / float64(az.cfg.SampleSize))))
 
 	if b < az.fftSize {
 		return b
@@ -208,7 +209,7 @@ func (az *analyzer) setSmoothing(factor float64) {
 		factor = math.SmallestNonzeroFloat64
 	}
 
-	var sf = math.Pow(10.0, (1.0-factor)*(-25.0))
+	sf := math.Pow(10.0, (1.0-factor)*(-25.0))
 
 	az.smoothFactor = math.Pow(sf, float64(az.cfg.SampleSize)/az.cfg.SampleRate)
 }

dsp/window/window.go

@@ -15,9 +15,9 @@ func Rectangle(buf []float64) {
 
 // CosSum modifies the buffer to conform to a cosine sum window following a0
 func CosSum(buf []float64, a0 float64) {
-	var size = len(buf)
-	var a1 = 1.0 - a0
-	var coef = 2.0 * math.Pi / float64(size)
+	size := len(buf)
+	a1 := 1.0 - a0
+	coef := 2.0 * math.Pi / float64(size)
 	for n := 0; n < size; n++ {
 		buf[n] *= (a0 - (a1 * math.Cos(coef*float64(n))))
 	}
@@ -65,7 +65,7 @@ func Hann(buf []float64) {
 
 // Bartlett modifies the buffer to a Bartlett window
 func Bartlett(buf []float64) {
-	var N = float64(len(buf))
+	N := float64(len(buf))
 	for n := range buf {
 		buf[n] *= (1.0 - (math.Abs(((2.0 * float64(n)) - N) / N)))
 	}
@@ -94,8 +94,8 @@ func Blackman(buf []float64) {
 //
 // not sure how i got this
 func PlanckTaper(buf []float64, e float64) {
-	var size = len(buf)
-	var eN = e * float64(size)
+	size := len(buf)
+	eN := e * float64(size)
 
 	buf[0] *= 0
 	for n := 1; n < int(eN); n++ {

fft/fft_test.go

@@ -28,9 +28,9 @@ func Benchmark(b *testing.B) {
 const numReals = 44100
 
 func generateReals() []float64 {
-	var input = make([]float64, numReals)
+	input := make([]float64, numReals)
 
-	var c = 3.1
+	c := 3.1
 	for i := range input {
 		c += 0.3
 		input[i] = 2*c - c*c

fft/fftw.go

@@ -1,4 +1,4 @@
-//go:build cgo && !windows && !nofftw
+//go:build cgo && ((!windows && !nofftw) || (windows && fftwonwin))
 
 package fft
 

fft/gonum.go

@@ -1,4 +1,4 @@
-//go:build !cgo || nofftw || windows
+//go:build !cgo || nofftw || (windows && !fftwonwin)
 
 package fft
 

go.mod

@@ -1,12 +1,13 @@
 module github.com/noriah/catnip
 
-go 1.15
+go 1.18
 
 require (
 	github.com/integrii/flaggy v1.4.4
-	github.com/lawl/pulseaudio v0.0.0-20200802093727-ab0735955fd0
-	github.com/mattn/go-runewidth v0.0.13 // indirect
-	github.com/nsf/termbox-go v0.0.0-20200418040025-38ba6e5628f1
+	github.com/lawl/pulseaudio v0.0.0-20210928141934-ed754c0c6618
+	github.com/nsf/termbox-go v1.1.1
 	github.com/pkg/errors v0.9.1
-	gonum.org/v1/gonum v0.8.1
+	gonum.org/v1/gonum v0.11.0
 )
+
+require github.com/mattn/go-runewidth v0.0.9 // indirect

go.sum

@@ -1,37 +1,13 @@
-github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=
-github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
-github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
 github.com/integrii/flaggy v1.4.4 h1:8fGyiC14o0kxhTqm2VBoN19fDKPZsKipP7yggreTMDc=
 github.com/integrii/flaggy v1.4.4/go.mod h1:tnTxHeTJbah0gQ6/K0RW0J7fMUBk9MCF5blhm43LNpI=
-github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
-github.com/lawl/pulseaudio v0.0.0-20200802093727-ab0735955fd0 h1:JrvOwrr1teFiqsp0EQxgEPJsm0pet+YLTL+HdYmnMx0=
-github.com/lawl/pulseaudio v0.0.0-20200802093727-ab0735955fd0/go.mod h1:9h36x4KH7r2V8DOCKoPMt87IXZ++X90y8D5nnuwq290=
+github.com/lawl/pulseaudio v0.0.0-20210928141934-ed754c0c6618 h1:lktbhQBHluc1oWEDow4DEv13qkWJ8zm/dTUSKer2iKk=
+github.com/lawl/pulseaudio v0.0.0-20210928141934-ed754c0c6618/go.mod h1:9h36x4KH7r2V8DOCKoPMt87IXZ++X90y8D5nnuwq290=
+github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
 github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
-github.com/mattn/go-runewidth v0.0.12 h1:Y41i/hVW3Pgwr8gV+J23B9YEY0zxjptBuCWEaxmAOow=
-github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
-github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU=
-github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
-github.com/noriah/termbox-go v1.1.1 h1:fFwcWznTCH33NHhbHWvR9of/opQa4YecWMU+cQKIyA0=
-github.com/noriah/termbox-go v1.1.1/go.mod h1:T0cTdVuOwf7pHQNtfhnEbzHbcNyCEcVU4YPpouCbVxo=
-github.com/nsf/termbox-go v0.0.0-20200418040025-38ba6e5628f1 h1:lh3PyZvY+B9nFliSGTn5uFuqQQJGuNrD0MLCokv09ag=
-github.com/nsf/termbox-go v0.0.0-20200418040025-38ba6e5628f1/go.mod h1:IuKpRQcYE1Tfu+oAQqaLisqDeXgjyyltCfsaoYN18NQ=
+github.com/nsf/termbox-go v1.1.1 h1:nksUPLCb73Q++DwbYUBEglYBRPZyoXJdrj5L+TkjyZY=
+github.com/nsf/termbox-go v1.1.1/go.mod h1:T0cTdVuOwf7pHQNtfhnEbzHbcNyCEcVU4YPpouCbVxo=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/rivo/uniseg v0.1.0 h1:+2KBaVoUmb9XzDsrx/Ct0W/EYOSFf/nWTauy++DprtY=
-github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
-github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2 h1:y102fOLFqhV41b+4GPiJoa0k/x+pJcEi2/HB1Y5T6fU=
-golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
-golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo=
-gonum.org/v1/gonum v0.8.1 h1:wGtP3yGpc5mCLOLeTeBdjeui9oZSz5De0eOjMLC/QuQ=
-gonum.org/v1/gonum v0.8.1/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0=
-gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0 h1:OE9mWmgKkjJyEmDAAtGMPjXu+YNeGvK9VTSHY6+Qihc=
-gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
-gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc=
-rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
+golang.org/x/exp v0.0.0-20191002040644-a1355ae1e2c3 h1:n9HxLrNxWWtEb1cA950nuEEj3QnKbtsCJ6KjcgisNUs=
+gonum.org/v1/gonum v0.11.0 h1:f1IJhK4Km5tBJmaiJXtk/PkL4cdVX6J+tGiM187uT5E=
+gonum.org/v1/gonum v0.11.0/go.mod h1:fSG4YDCxxUZQJ7rKsQrj0gMOg00Il0Z96/qMA4bVQhA=