changes

Author: noriah

catnip.go

@@ -41,8 +41,6 @@ func Run(cfg *Config, ctx context.Context) error {
 		vis = processor.New(procConfig)
 	}
 
-	// INPUT SETUP
-
 	backend, err := input.InitBackend(cfg.Backend)
 	if err != nil {
 		return err
@@ -65,8 +63,6 @@ func Run(cfg *Config, ctx context.Context) error {
 		return errors.Wrap(err, "failed to start the input backend")
 	}
 
-	// DISPLAY SETUP
-
 	if cfg.SetupFunc != nil {
 		if err := cfg.SetupFunc(); err != nil {
 			return err
@@ -90,7 +86,6 @@ func Run(cfg *Config, ctx context.Context) error {
 
 	mu := &sync.Mutex{}
 
-	// Start the processor
 	go vis.Process(ctx, kickChan, mu)
 
 	if err := audio.Start(ctx, inputBuffers, kickChan, mu); err != nil {

cmd/catnip/config.go

@@ -51,23 +51,17 @@ type config struct {
 
 // NewZeroConfig returns a zero config
 // it is the "default"
-//
-// nori's defaults:
-//   - sampleRate: 122880
-//   - sampleSize: 2048
-//   - smoothFactor: 80.15
-//   - super smooth detail view
 func newZeroConfig() config {
 	return config{
 		backend:                    input.DefaultBackend(),
 		sampleRate:                 44100,
 		sampleSize:                 1024,
-		smoothFactor:               74.15,
-		smoothingMethod:            dsp.SmoothSimpleAverage,
+		smoothFactor:               64.15,
+		smoothingMethod:            int(dsp.SmoothDefault),
 		smoothingAverageWindowSize: 0, // if zero, will be calculated
 		frameRate:                  0,
 		baseSize:                   1,
-		barSize:                    2,
+		barSize:                    1,
 		spaceSize:                  1,
 		channelCount:               2,
 		drawType:                   int(graphic.DrawDefault),

cmd/catnip/main.go

@@ -27,7 +27,7 @@ const AppDesc = "Continuous Automatic Terminal Number Interpretation Printer"
 // AppSite is the app website
 const AppSite = "https://github.com/noriah/catnip"
 
-var version = "unknown"
+var version = "git"
 
 func main() {
 	log.SetFlags(0)
@@ -66,7 +66,6 @@ func main() {
 		},
 		StartFunc: func(ctx context.Context) (context.Context, error) {
 			ctx = display.Start(ctx)
-
 			return ctx, nil
 		},
 		CleanupFunc: func() error {

dsp/smoother.go

@@ -9,21 +9,23 @@ import (
 type SmoothingMethod int
 
 const (
-	SmoothUnspecified   = iota // 0
-	SmoothSimple               // 1
-	SmoothAverage              // 2
-	SmoothSimpleAverage        // 3
-	SmoothNew                  // 5
-	SmoothNewAverage           // 4
+	SmoothUnspecified   SmoothingMethod = iota // 0
+	SmoothSimple                               // 1
+	SmoothAverage                              // 2
+	SmoothSimpleAverage                        // 3
+	SmoothNew                                  // 5
+	SmoothNewAverage                           // 4
+
+	SmoothDefault = SmoothSimpleAverage
 )
 
 type SmootherConfig struct {
+	AverageSize     int             // size of window for average methods
+	ChannelCount    int             // number of channels
 	SampleSize      int             // number of samples per slice
 	SampleRate      float64         // sample rate
-	ChannelCount    int             // number of channels
 	SmoothingFactor float64         // smoothing factor
 	SmoothingMethod SmoothingMethod // smoothing method
-	AverageSize     int             // size of window for average methods
 }
 
 type Smoother interface {
@@ -39,9 +41,14 @@ type smoother struct {
 }
 
 func NewSmoother(cfg SmootherConfig) Smoother {
+	if cfg.SmoothingFactor <= 0.0 {
+		cfg.SmoothingFactor = math.SmallestNonzeroFloat64
+	}
+
 	sm := &smoother{
 		values:       make([][]float64, cfg.ChannelCount),
 		averages:     make([][]*util.MovingWindow, cfg.ChannelCount),
+		smoothFactor: cfg.SmoothingFactor,
 		smoothMethod: cfg.SmoothingMethod,
 	}
 
@@ -65,8 +72,6 @@ func NewSmoother(cfg SmootherConfig) Smoother {
 		}
 	}
 
-	sm.setSmoothing(cfg.SmoothingFactor)
-
 	return sm
 }
 
@@ -91,13 +96,6 @@ func (sm *smoother) SmoothBin(ch, idx int, value float64) float64 {
 	return sm.switchSmoothing(ch, idx, value, 0.0)
 }
 
-func (sm *smoother) setSmoothing(factor float64) {
-	if factor <= 0.0 {
-		factor = math.SmallestNonzeroFloat64
-	}
-	sm.smoothFactor = factor
-}
-
 func (sm *smoother) switchSmoothing(ch, idx int, value, peak float64) float64 {
 	switch sm.smoothMethod {
 	default:

graphic/display.go

@@ -311,22 +311,22 @@ func (d *Display) Write(buffers [][]float64, channels int) error {
 
 	switch d.drawType {
 	case DrawUp:
-		d.DrawUp(buffers, channels, scale)
+		d.drawUp(buffers, channels, scale)
 
 	case DrawUpDown:
-		d.DrawUpDown(buffers, channels, scale)
+		d.drawUpDown(buffers, channels, scale)
 
 	case DrawDown:
-		d.DrawDown(buffers, channels, scale)
+		d.drawDown(buffers, channels, scale)
 
 	case DrawLeft:
-		d.DrawLeft(buffers, channels, scale)
+		d.drawLeft(buffers, channels, scale)
 
 	case DrawLeftRight:
-		d.DrawLeftRight(buffers, channels, scale)
+		d.drawLeftRight(buffers, channels, scale)
 
 	case DrawRight:
-		d.DrawRight(buffers, channels, scale)
+		d.drawRight(buffers, channels, scale)
 
 	default:
 		return nil
@@ -433,8 +433,8 @@ func sizeAndCap(value float64, space int, zeroBase bool, baseRune rune) (int, ru
 
 // DRAWING METHODS
 
-// DrawUp will draw up.
-func (d *Display) DrawUp(bins [][]float64, channelCount int, scale float64) {
+// drawUp will draw up.
+func (d *Display) drawUp(bins [][]float64, channelCount int, scale float64) {
 	binCount := d.Bins(channelCount)
 	barSpace := intMax(d.termHeight-d.baseSize, 0)
 	scale = float64(barSpace) / scale
@@ -474,8 +474,8 @@ func (d *Display) DrawUp(bins [][]float64, channelCount int, scale float64) {
 	}
 }
 
-// DrawUpDown will draw up and down.
-func (d *Display) DrawUpDown(bins [][]float64, channelCount int, scale float64) {
+// drawUpDown will draw up and down.
+func (d *Display) drawUpDown(bins [][]float64, channelCount int, scale float64) {
 	binCount := d.Bins(channelCount)
 	centerStart := intMax((d.termHeight-d.baseSize)/2, 0)
 	centerStop := centerStart + d.baseSize
@@ -521,8 +521,8 @@ func (d *Display) DrawUpDown(bins [][]float64, channelCount int, scale float64)
 	}
 }
 
-// DrawDown will draw down.
-func (d *Display) DrawDown(bins [][]float64, channelCount int, scale float64) {
+// drawDown will draw down.
+func (d *Display) drawDown(bins [][]float64, channelCount int, scale float64) {
 	binCount := d.Bins(channelCount)
 	barSpace := intMax(d.termHeight-d.baseSize, 0)
 	scale = float64(barSpace) / scale
@@ -566,7 +566,7 @@ func (d *Display) DrawDown(bins [][]float64, channelCount int, scale float64) {
 	}
 }
 
-func (d *Display) DrawLeft(bins [][]float64, channelCount int, scale float64) {
+func (d *Display) drawLeft(bins [][]float64, channelCount int, scale float64) {
 	binCount := d.Bins(channelCount)
 	barSpace := intMax(d.termWidth-d.baseSize, 0)
 	scale = float64(barSpace) / scale
@@ -606,8 +606,8 @@ func (d *Display) DrawLeft(bins [][]float64, channelCount int, scale float64) {
 	}
 }
 
-// DrawLeftRight will draw left and right.
-func (d *Display) DrawLeftRight(bins [][]float64, channelCount int, scale float64) {
+// drawLeftRight will draw left and right.
+func (d *Display) drawLeftRight(bins [][]float64, channelCount int, scale float64) {
 	binCount := d.Bins(channelCount)
 	centerStart := intMax((d.termWidth-d.baseSize)/2, 0)
 	centerStop := centerStart + d.baseSize
@@ -656,7 +656,7 @@ func (d *Display) DrawLeftRight(bins [][]float64, channelCount int, scale float6
 	}
 }
 
-func (d *Display) DrawRight(bins [][]float64, channelCount int, scale float64) {
+func (d *Display) drawRight(bins [][]float64, channelCount int, scale float64) {
 	binCount := d.Bins(channelCount)
 	barSpace := intMax(d.termWidth-d.baseSize, 0)
 	scale = float64(barSpace) / scale

input/backend.go

@@ -95,12 +95,7 @@ func FindBackend(name string) Backend {
 }
 
 func HasBackend(name string) bool {
-	for _, backend := range Backends {
-		if backend.Name == name {
-			return true
-		}
-	}
-	return false
+	return FindBackend(name) != nil
 }
 
 func InitBackend(bknd string) (Backend, error) {