lets slim down!

Author: noriah

config.go

@@ -61,6 +61,7 @@ func NewZeroConfig() Config {
 }
 
 func sanitizeConfig(cfg *Config) error {
+
 	switch {
 	case cfg.WinVar > 1.0:
 		cfg.WinVar = 1.0

dsp/spectrum.go

@@ -161,11 +161,9 @@ func (sp *Spectrum) Process(win window.Function) {
 			switch {
 			case mag < 0.0:
 				mag = 0.0
-				continue
 
 			case sp.bins[xB].floorFFT < bassCut:
-				pow *= math.Max(0.6, float64(xF)/fBassCut)
-
+				pow *= math.Max(0.75, float64(xF)/fBassCut)
 			}
 
 			mag *= sp.bins[xB].eqVal
@@ -216,11 +214,12 @@ func (sp *Spectrum) Recalculate(bins int) int {
 		sp.distributeEqual(bins)
 
 	default:
+		sp.distributeLog(bins)
+
 	}
 
 	// set widths
 	for xB := 0; xB < bins; xB++ {
-
 		sp.bins[xB].widthFFT = sp.bins[xB].ceilFFT - sp.bins[xB].floorFFT
 	}
 
@@ -237,9 +236,9 @@ func (sp *Spectrum) distributeLog(bins int) {
 	var cF = math.Log10(lo/hi) / ((1 / float64(bins)) - 1)
 
 	var getBinBase = func(b int) int {
-		var vFreq = ((float64(b+1) / float64(bins)) * cF) - cF
+		var vFreq = ((float64(b) / float64(bins)) * cF) - cF
 		vFreq = math.Pow(10.0, vFreq) * hi
-		return sp.freqToIdx(vFreq, math.Round)
+		return sp.freqToIdx(vFreq, math.Floor)
 	}
 
 	var cCoef = 100.0 / float64(bins+1)
@@ -282,7 +281,6 @@ func (sp *Spectrum) distributeEqual(bins int) {
 	}
 
 	for xB := 0; xB < lBins; xB++ {
-		sp.bins[xB].widthFFT = spread
 		sp.bins[xB].floorFFT = start
 		start += spread
 
@@ -292,7 +290,6 @@ func (sp *Spectrum) distributeEqual(bins int) {
 	if last > 0 {
 		sp.bins[lBins].floorFFT = start
 		sp.bins[lBins].ceilFFT = start + last
-		sp.bins[lBins].widthFFT = last
 	}
 }
 
@@ -328,7 +325,6 @@ func (sp *Spectrum) SetWinVar(g float64) {
 		sp.winVar = g
 
 	}
-
 }
 
 // SetSmoothing sets the smoothing parameters
@@ -342,5 +338,4 @@ func (sp *Spectrum) SetSmoothing(factor float64) {
 		sp.smoothFactor = factor
 
 	}
-
 }

graphic/display.go

@@ -15,9 +15,6 @@ const (
 
 	// Bar Constants
 
-	// DisplaySpace is the block we use for space (if we were to print one)
-	DisplaySpace = '\u0020'
-
 	BarRuneR = '\u2580'
 	BarRune  = '\u2588'
 
@@ -101,6 +98,44 @@ func NewDisplay(hz float64, samples int) *Display {
 	return d
 }
 
+// Draw takes data and draws
+func (d *Display) Draw(bufs [][]float64, channels, bins int) error {
+	var peak = 0.0
+
+	for xCh := 0; xCh < channels; xCh++ {
+		for xBin := 0; xBin < bins; xBin++ {
+			if v := bufs[xCh][xBin]; peak < v {
+				peak = v
+			}
+		}
+	}
+
+	var scale = d.updateWindow(peak)
+
+	var err error
+
+	switch d.cfg.DrawType {
+	case DrawUp:
+		err = drawUp(bufs, bins, d.cfg, scale)
+	case DrawUpDown:
+		err = drawUpDown(bufs, bins, d.cfg, scale)
+	case DrawDown:
+		err = drawDown(bufs, bins, d.cfg, scale)
+	default:
+		return nil
+	}
+
+	if err != nil {
+		return err
+	}
+
+	termbox.Flush()
+
+	termbox.Clear(StyleDefault, StyleDefaultBack)
+
+	return nil
+}
+
 // Init initializes the display
 func (d *Display) Init() error {
 	if err := termbox.Init(); err != nil {
@@ -295,44 +330,6 @@ func (d *Display) updateWindow(peak float64) float64 {
 	return 1.0
 }
 
-// Draw takes data and draws
-func (d *Display) Draw(bufs [][]float64, channels, bins int) error {
-	var peak = 0.0
-
-	for xCh := 0; xCh < channels; xCh++ {
-		for xBin := 0; xBin < bins; xBin++ {
-			if v := bufs[xCh][xBin]; peak < v {
-				peak = v
-			}
-		}
-	}
-
-	var scale = d.updateWindow(peak)
-
-	var err error
-
-	switch d.cfg.DrawType {
-	case DrawUp:
-		err = drawUp(bufs, bins, d.cfg, scale)
-	case DrawUpDown:
-		err = drawUpDown(bufs, bins, d.cfg, scale)
-	case DrawDown:
-		err = drawDown(bufs, bins, d.cfg, scale)
-	default:
-		return nil
-	}
-
-	if err != nil {
-		return err
-	}
-
-	termbox.Flush()
-
-	termbox.Clear(StyleDefault, StyleDefaultBack)
-
-	return nil
-}
-
 func stopAndTop(value float64, height int, up bool) (int, rune) {
 	if stop := int(value * NumRunes); stop < height*NumRunes {
 

input/portaudio/portaudio.go

@@ -157,6 +157,12 @@ func (s *Session) Read(ctx context.Context) error {
 		s.retBufs[i%s.config.FrameSize][i/s.config.FrameSize] = float64(v)
 	}
 
+	// for xBuf := range s.retBufs {
+	// 	for xSmpl := range s.retBufs[xBuf] {
+	// 		s.retBufs[xBuf][xSmpl] = input.Sample(s.sampleBuf[(xSmpl*s.config.FrameSize)+xBuf])
+	// 	}
+	// }
+
 	if err != portaudio.InputOverflowed {
 		return err
 	}

input/portaudio/portaudio/cb.c

@@ -6,7 +6,6 @@ package portaudio
 
 // #cgo pkg-config: portaudio-2.0
 // #include <portaudio.h>
-// extern PaStreamCallback* paStreamCallback;
 import "C"
 
 import (
@@ -60,10 +59,6 @@ const (
 	OutputUnderflowed                     Error = C.paOutputUnderflowed
 	HostApiNotFound                       Error = C.paHostApiNotFound
 	InvalidHostApi                        Error = C.paInvalidHostApi
-	CanNotReadFromACallbackStream         Error = C.paCanNotReadFromACallbackStream
-	CanNotWriteToACallbackStream          Error = C.paCanNotWriteToACallbackStream
-	CanNotReadFromAnOutputOnlyStream      Error = C.paCanNotReadFromAnOutputOnlyStream
-	CanNotWriteToAnInputOnlyStream        Error = C.paCanNotWriteToAnInputOnlyStream
 	IncompatibleStreamHostApi             Error = C.paIncompatibleStreamHostApi
 	BadBufferPtr                          Error = C.paBadBufferPtr
 )
@@ -399,8 +394,6 @@ type Stream struct {
 	paStream            unsafe.Pointer
 	inParams, outParams *C.PaStreamParameters
 	in, out             *reflect.SliceHeader
-	timeInfo            StreamCallbackTimeInfo
-	flags               StreamCallbackFlags
 	args                []reflect.Value
 	callback            reflect.Value
 	closed              bool
@@ -438,47 +431,6 @@ func delStream(s *Stream) {
 	delete(streams, s.id)
 }
 
-// StreamCallbackTimeInfo contains timing information for the
-// buffers passed to the stream callback.
-type StreamCallbackTimeInfo struct {
-	InputBufferAdcTime, CurrentTime, OutputBufferDacTime time.Duration
-}
-
-// StreamCallbackFlags are flag bit constants for the statusFlags to StreamCallback.
-type StreamCallbackFlags C.PaStreamCallbackFlags
-
-// PortAudio stream callback flags.
-const (
-	// In a stream opened with FramesPerBufferUnspecified,
-	// InputUnderflow indicates that input data is all silence (zeros)
-	// because no real data is available.
-	//
-	// In a stream opened without FramesPerBufferUnspecified,
-	// InputUnderflow indicates that one or more zero samples have been inserted
-	// into the input buffer to compensate for an input underflow.
-	InputUnderflow StreamCallbackFlags = C.paInputUnderflow
-
-	// In a stream opened with FramesPerBufferUnspecified,
-	// indicates that data prior to the first sample of the
-	// input buffer was discarded due to an overflow, possibly
-	// because the stream callback is using too much CPU time.
-	//
-	// Otherwise indicates that data prior to one or more samples
-	// in the input buffer was discarded.
-	InputOverflow StreamCallbackFlags = C.paInputOverflow
-
-	// Indicates that output data (or a gap) was inserted,
-	// possibly because the stream callback is using too much CPU time.
-	OutputUnderflow StreamCallbackFlags = C.paOutputUnderflow
-
-	// Indicates that output data will be discarded because no room is available.
-	OutputOverflow StreamCallbackFlags = C.paOutputOverflow
-
-	// Some of all of the output data will be used to prime the stream,
-	// input data may be zero.
-	PrimingOutput StreamCallbackFlags = C.paPrimingOutput
-)
-
 // OpenStream creates an instance of a Stream.
 //
 // For an input- or output-only stream, p.Output.Device or p.Input.Device must be nil, respectively.
@@ -494,11 +446,7 @@ func OpenStream(p StreamParameters, args ...interface{}) (*Stream, error) {
 		delStream(s)
 		return nil, err
 	}
-	cb := C.paStreamCallback
-	if !s.callback.IsValid() {
-		cb = nil
-	}
-	paErr := C.Pa_OpenStream(&s.paStream, s.inParams, nil, C.double(p.SampleRate), C.ulong(p.FramesPerBuffer), C.PaStreamFlags(p.Flags), cb, unsafe.Pointer(s.id))
+	paErr := C.Pa_OpenStream(&s.paStream, s.inParams, nil, C.double(p.SampleRate), C.ulong(p.FramesPerBuffer), C.PaStreamFlags(p.Flags), nil, unsafe.Pointer(s.id))
 	if paErr != C.paNoError {
 		delStream(s)
 		return nil, newError(paErr)
@@ -627,21 +575,6 @@ func (s *Stream) Start() error {
 	return newError(C.Pa_StartStream(s.paStream))
 }
 
-//export streamCallback
-func streamCallback(inputBuffer, outputBuffer unsafe.Pointer, frames C.ulong, timeInfo *C.PaStreamCallbackTimeInfo, statusFlags C.PaStreamCallbackFlags, userData unsafe.Pointer) {
-	// defer func() {
-	// 	// Don't let PortAudio silently swallow panics.
-	// 	if x := recover(); x != nil {
-	// 		buf := make([]byte, 1<<10)
-	// 		for runtime.Stack(buf, true) == len(buf) {
-	// 			buf = make([]byte, 2*len(buf))
-	// 		}
-	// 		fmt.Fprintf(os.Stderr, "panic in portaudio stream callback: %s\n\n%s", x, buf)
-	// 		os.Exit(2)
-	// 	}
-	// }()
-}
-
 // Stop terminates audio processing. It waits until all pending
 // audio buffers have been played before it returns.
 func (s *Stream) Stop() error {
@@ -702,12 +635,6 @@ func (s *Stream) AvailableToRead() (int, error) {
 // Read uses the buffer provided to OpenStream.
 // The number of samples to read is determined by the size of the buffer.
 func (s *Stream) Read() error {
-	if s.callback.IsValid() {
-		return CanNotReadFromACallbackStream
-	}
-	if s.in == nil {
-		return CanNotReadFromAnOutputOnlyStream
-	}
 	buf, frames, err := getBuffer(s.in, s.inParams)
 	if err != nil {
 		return err

input/portaudio/portaudio/portaudio.go

@@ -18,14 +18,15 @@ import (
 func Run(cfg Config) error {
 	// DrawDelay is the time we wait between ticks to draw.
 	var drawDelay = time.Second / time.Duration(
-		int((cfg.SampleRate/float64(cfg.SampleSize))+1))
+		int((cfg.SampleRate / float64(cfg.SampleSize))))
 
 	var audio, err = cfg.InputBackend.Start(input.SessionConfig{
 		Device:     cfg.InputDevice,
 		FrameSize:  cfg.ChannelCount,
 		SampleSize: cfg.SampleSize,
 		SampleRate: cfg.SampleRate,
 	})
+	defer cfg.InputBackend.Close()
 
 	if err != nil {
 		return errors.Wrap(err, "failed to start the input backend")
@@ -54,9 +55,6 @@ func Run(cfg Config) error {
 	display.SetBase(cfg.BaseThick)
 	display.SetDrawType(graphic.DrawType(cfg.DrawType))
 
-	var timer = time.NewTimer(0)
-	defer timer.Stop()
-
 	var endSig = make(chan os.Signal, 2)
 	signal.Notify(endSig, os.Interrupt)
 	signal.Notify(endSig, os.Kill)
@@ -82,12 +80,15 @@ func Run(cfg Config) error {
 	}
 	defer audio.Stop()
 
+	var timer = time.NewTimer(0)
+	defer timer.Stop()
+
 	for {
 		if audio.ReadyRead() < cfg.SampleSize {
 			continue
 		}
 
-		if err := audio.Read(ctx); err != nil {
+		if err = audio.Read(ctx); err != nil {
 			return errors.Wrap(err, "failed to read audio input")
 		}
 
@@ -97,8 +98,8 @@ func Run(cfg Config) error {
 
 		spectrum.Process(win)
 
-		if err := display.Draw(barBuffers, cfg.ChannelCount, barCount); err != nil {
-			return errors.Wrap(err, "graphic threw an error. this should not happen.")
+		if err = display.Draw(barBuffers, cfg.ChannelCount, barCount); err != nil {
+			return errors.Wrap(err, "graphic threw error. this should not happen.")
 		}
 
 		select {