idk

Author: noriah

CatnipJulia/src/run_catnip.jl

@@ -1,24 +1,30 @@
-GLMakie.activate!()
+using Colors
+using DataStructures: CircularBuffer
+using GLMakie
 
-# set_theme!(theme_black())
+set_theme!(theme_black())
 
-set_window_config!(;
+GLMakie.activate!(;
   vsync=false,
   framerate=60.0,
-  float=true,
+  float=false,
   pause_renderloop=false,
   focus_on_show=false,
   decorated=true,
   title="catnip"
 )
 
 function run_catnip(; timeout=false)
-  # 5 seconds at 60 samples per second out of catnip
+  # 6 seconds at 60 samples per second out of catnip
   numSets = 300
+  # numSets = 120
 
-  fig = Figure(resolution=(1200, 800), fontsize=14)
+  fig = Figure(fontsize=14; size=(1200, 888))
   ax1 = Axis3(fig[1, 1]; aspect=(2, 1, 0.25), elevation=pi / 6, perspectiveness=0.5)
 
+  hidedecorations!(ax1)
+  hidespines!(ax1)
+
   data = CircularBuffer{Vector{Float64}}(numSets)
 
   push!(data, [0.0, 0.0])
@@ -58,27 +64,31 @@ function run_catnip(; timeout=false)
     return mat
   end
 
-  function makeColorMap2(z, s, b, x)
-    d = z[:]
+  function makeColorMap2(data, sets, bars, idx)
+    d = data[:]
 
-    maxValue = reduce(d) do left, right
-      left > right ? left : right
+    for n in eachindex(d)
+      d[n] > 100.0 && (d[n] = 100.0)
+      # d[n] < 1.0 && (d[n] = 100.0)
     end
 
-    maxValue = max(maxValue, 100.0)
+    # for j = 0:bars-1
+    #   d[idx+(j*sets)] = 100.0
+    # end
 
-    for j = 0:b-1
-      d[x+(j*s)] = maxValue
+    for j = 0:bars-1
+      d[idx+(j*sets)] = 100.0
     end
 
-    d[1] = 0.0
+    d[idx] = 0.0
+    d[idx+((bars-1)*sets)] = 100.0
 
     return d
   end
 
   zC = @lift($z[:])
 
-  staticColorMap = @lift(makeColorMap2($z, $sets, $bars, $idx)[:])
+  staticColorMap = @lift(makeColorMap2($z, $sets, $bars, $idx))
 
 
   function updateZ()
@@ -89,7 +99,12 @@ function run_catnip(; timeout=false)
 
   display(fig)
 
-  command = `catnip -d spotify -r 122880 -n 2048 -sas 6 -sf 45 -i -nw -nwb 60`
+  mymagma = GLMakie.to_colormap(:magma)
+  # mymagma = GLMakie.to_colormap(:BuPu_9)
+  mymagma[1] = RGBA(0.0,0.0,0.0,0.0)
+
+  command = `catnip -d spotify -r 122880 -n 2048 -sas 6 -sf 45 -i -nw -nwb 81`
+  # command = `catnip -d "Google Chrome" -r 122880 -n 2048 -sas 6 -sf 45 -i -nw -nwb 60`
   #command = `go run ./cmd/catnip -d spotify -r 122880 -n 2048 -sas 5 -sf 45 -i -nw -nwb 50`
 
 
@@ -113,9 +128,11 @@ function run_catnip(; timeout=false)
       limits!(ax1, 0, sets[], 0, bars[], 0, 100)
 
       meshscatter!(ax1, x, y, zZ; marker=rectMesh, color=staticColorMap,
-        markersize=mSize, colormap=:plasma,
-        shading=true)
+        markersize=mSize, colormap=mymagma,
+        # markersize=mSize, colormap=:plasma,
+        shading=MultiLightShading)
 
+      idx[] = numSets
 
 
       #while !eof(io) && (count < numSets + 4 || !timeout)
@@ -132,12 +149,12 @@ function run_catnip(; timeout=false)
         nums = map(x -> parse(Float64, strip(x)), elms)
         nums = reverse(nums)
 
-        idx[] = numSets - count
+        # idx[] = numSets - count
         #println(nums)
 
-        data[idx[]] = nums
+        # data[idx[]] = nums
 
-        # pushfirst!(data, nums)
+        pushfirst!(data, nums)
 
         updateZ()
       end
@@ -146,3 +163,5 @@ function run_catnip(; timeout=false)
     @show e
   end
 end
+
+run_catnip()

dsp/analyzer.go

@@ -127,6 +127,10 @@ func (az *analyzer) ProcessBin(idx int, src []complex128) float64 {
 		fftCeil = az.fftSize
 	}
 
+	if fftFloor >= fftCeil {
+		fftFloor = fftCeil - 1
+	}
+
 	src = src[fftFloor:fftCeil]
 	mag := 0.0
 	count := len(src)

graphic/display.go

@@ -168,7 +168,7 @@ func (d *Display) Stop() error {
 func (d *Display) Write(buffers [][]float64, channels int) error {
 
 	peak := 0.0
-	bins := d.Bins(channels)
+	bins := d.binsInternal(channels, bufferLength(buffers))
 
 	for i := 0; i < channels; i++ {
 		for _, val := range buffers[i][:bins] {
@@ -311,6 +311,18 @@ func (d *Display) Bins(chCount int) int {
 	}
 }
 
+func bufferLength(buffers [][]float64) int {
+	return len(buffers[0])
+}
+
+func (d *Display) binsInternal(chCount, bufLen int) int {
+	bins := d.Bins(chCount)
+	if bins >= bufLen {
+		bins = bufLen - 1
+	}
+	return bins
+}
+
 func (d *Display) inputProcessor() {
 	if d.cancel != nil {
 		defer d.cancel()
@@ -474,7 +486,7 @@ func sizeAndCap(value float64, space int, zeroBase bool, baseRune rune) (int, ru
 
 // drawUp will draw up.
 func (d *Display) drawUp(bins [][]float64, channelCount int, scale float64) {
-	binCount := d.Bins(channelCount)
+	binCount := d.binsInternal(channelCount, bufferLength(bins))
 	barSpace := intMax(d.termHeight-d.baseSize, 0)
 	scale = float64(barSpace) / scale
 
@@ -515,7 +527,7 @@ 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) {
-	binCount := d.Bins(channelCount)
+	binCount := d.binsInternal(channelCount, bufferLength(bins))
 	centerStart := intMax((d.termHeight-d.baseSize)/2, 0)
 	centerStop := centerStart + d.baseSize
 
@@ -563,7 +575,7 @@ func (d *Display) drawUpDown(bins [][]float64, channelCount int, scale float64)
 // drawUpDownSplit will draw up and down split down the middle for left and
 // right channels.
 func (d *Display) drawUpDownSplit(bins [][]float64, channelCount int, scale float64) {
-	binCount := d.Bins(2)
+	binCount := d.binsInternal(2, bufferLength(bins))
 	centerStart := intMax((d.termHeight-d.baseSize)/2, 0)
 	centerStop := centerStart + d.baseSize
 
@@ -616,7 +628,7 @@ func (d *Display) drawUpDownSplit(bins [][]float64, channelCount int, scale floa
 // drawUpDownSplitVert will draw up and down split down the middle for left and
 // right channels.
 func (d *Display) drawUpDownSplitVert(bins [][]float64, channelCount int, scale float64) {
-	binCount := d.Bins(2)
+	binCount := d.binsInternal(2, bufferLength(bins))
 	centerStart := intMax((d.termHeight-d.baseSize)/2, 0)
 	centerStop := centerStart + d.baseSize
 
@@ -668,7 +680,7 @@ func (d *Display) drawUpDownSplitVert(bins [][]float64, channelCount int, scale
 
 // drawDown will draw down.
 func (d *Display) drawDown(bins [][]float64, channelCount int, scale float64) {
-	binCount := d.Bins(channelCount)
+	binCount := d.binsInternal(channelCount, bufferLength(bins))
 	barSpace := intMax(d.termHeight-d.baseSize, 0)
 	scale = float64(barSpace) / scale
 
@@ -712,7 +724,7 @@ func (d *Display) drawDown(bins [][]float64, channelCount int, scale float64) {
 }
 
 func (d *Display) drawLeft(bins [][]float64, channelCount int, scale float64) {
-	binCount := d.Bins(channelCount)
+	binCount := d.binsInternal(channelCount, bufferLength(bins))
 	barSpace := intMax(d.termWidth-d.baseSize, 0)
 	scale = float64(barSpace) / scale
 
@@ -753,7 +765,7 @@ 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) {
-	binCount := d.Bins(channelCount)
+	binCount := d.binsInternal(channelCount, bufferLength(bins))
 	centerStart := intMax((d.termWidth-d.baseSize)/2, 0)
 	centerStop := centerStart + d.baseSize
 
@@ -803,7 +815,7 @@ func (d *Display) drawLeftRight(bins [][]float64, channelCount int, scale float6
 
 // drawLeftRight will draw left and right.
 func (d *Display) drawLeftRightSplit(bins [][]float64, channelCount int, scale float64) {
-	binCount := d.Bins(2)
+	binCount := d.binsInternal(2, bufferLength(bins))
 	centerStart := intMax((d.termWidth-d.baseSize)/2, 0)
 	centerStop := centerStart + d.baseSize
 
@@ -854,7 +866,7 @@ func (d *Display) drawLeftRightSplit(bins [][]float64, channelCount int, scale f
 }
 
 func (d *Display) drawRight(bins [][]float64, channelCount int, scale float64) {
-	binCount := d.Bins(channelCount)
+	binCount := d.binsInternal(channelCount, bufferLength(bins))
 	barSpace := intMax(d.termWidth-d.baseSize, 0)
 	scale = float64(barSpace) / scale
 

input/all/all.go

@@ -5,4 +5,5 @@ import (
 	_ "github.com/noriah/catnip/input/ffmpeg"
 	_ "github.com/noriah/catnip/input/parec"
 	_ "github.com/noriah/catnip/input/pipewire"
+	_ "github.com/noriah/catnip/input/stdinput"
 )

input/common/execread/execread.go

@@ -100,7 +100,7 @@ func (s *Session) Start(ctx context.Context, dst [][]input.Sample, kickChan chan
 		// to the buffer.
 		timeout := sampleDuration
 		if !readExpired {
-			timeout *= 2
+			timeout *= 6
 		}
 		if err := of.SetReadDeadline(time.Now().Add(timeout)); err != nil {
 			return errors.Wrap(err, "failed to set read deadline")