Fix plan being #f

Signed-off-by: Skylar "The Cobra" Widulski <cobra@vern.cc>

.gitignore

@@ -1,3 +1,2 @@
-libyammer.so
-config.scm
+.libs
 *.swp

src/guile/yammer.scm

@@ -44,6 +44,7 @@
 (define using-pulse? #t)
 (define source "/tmp/mpd.fifo")
 (define source-type 'mpd)
+(define pulse-latency 10)
 (define bitrate 44100)
 (define sample-factor 2)
 (define fps 20)
@@ -64,15 +65,16 @@
   (exact (* 4 (round (* sample-factor (* (/ bitrate 4) recip-fps))))))
 
 (define (start config:using-fftw? config:using-pulse? config:source
-               config:source-type config:bitrate config:sample-factor config:fps
-               config:resolution config:scale config:color config:bgcolor
-               config:queue-size config:fft config:interpolation
-               config:smoothing-mode config:moving-average-block-size
-               config:exponential-factor)
+               config:source-type config:pulse-latency config:bitrate
+               config:sample-factor config:fps config:resolution config:scale
+               config:color config:bgcolor config:queue-size config:fft
+               config:interpolation config:smoothing-mode
+               config:moving-average-block-size config:exponential-factor)
   (set! using-fftw? config:using-fftw?)
   (set! using-pulse? config:using-pulse?)
   (set! source config:source)
   (set! source-type config:source-type)
+  (set! pulse-latency config:pulse-latency)
   (set! bitrate config:bitrate)
   (set! sample-factor config:sample-factor)
   (set! fps config:fps)
@@ -91,6 +93,9 @@
   (set! sample-size
     (exact (* 4 (round (* sample-factor (* (/ bitrate 4) recip-fps))))))
 
+  (if (and fft using-fftw?)
+    (set! plan (init_plan (exact (/ sample-size 4)))))
+
   ;; Initially open the MPD FIFO or connect to pulseaudio
   (cond
     ((eq? source-type 'mpd)
@@ -119,8 +124,6 @@
 
 ;; Plan definition (if using fft)
 (define plan #f)
-(if (and fft using-fftw?)
-  (monitor (set! plan (init_plan (exact (/ sample-size 4))))))
 
 ;; Initialize more values
 (define window #f)

src/guile/yammer/ffi.scm

@@ -67,7 +67,7 @@
 
     (set! make-pa-simple
       (lambda (rate dev latency)
-        (make_pa_simple rate (string->pointer dev latency))))
+        (make_pa_simple rate (string->pointer dev) latency)))
 
     (set! read_from_pa
       (pointer->procedure '*

yammer

@@ -1,3 +1,3 @@
-#!/usr/bin/env -S guile
+#!/usr/bin/env -S guile --no-auto-compile
 !#
-(define using-fftw? #t) (define using-pulse? #t) (define source "/tmp/mpd.fifo") (define source-type 'mpd) (define bitrate 44100) (define sample-factor 2) (define fps 20) (define resolution 1) (define scale 1) (define color #xff99c8ff) (define bgcolor #x2e2016ff) (define queue-size 1) (define fft #f) (define interpolation 0) (define smoothing-mode 'none) (define moving-average-block-size 24) (define exponential-factor 0.5) (set! %load-extensions (quote (".scm"))) (add-to-load-path (string-append (if (getenv "XDG_CONFIG_HOME") (getenv "XDG_CONFIG_HOME") (string-append (getenv "HOME") "/.config")) "/yammer")) (load-from-path "config") (use-modules (yammer)) (start using-fftw? using-pulse? source source-type bitrate sample-factor fps resolution scale color bgcolor queue-size fft interpolation smoothing-mode moving-average-block-size exponential-factor)
+(define using-fftw? #t) (define using-pulse? #t) (define source "/tmp/mpd.fifo") (define source-type 'mpd) (define bitrate 44100) (define sample-factor 2) (define fps 20) (define resolution 1) (define scale 1) (define color #xff99c8ff) (define bgcolor #x2e2016ff) (define queue-size 1) (define fft #f) (define interpolation 0) (define smoothing-mode 'none) (define moving-average-block-size 24) (define exponential-factor 0.5) (set! %load-extensions (quote (".scm"))) (add-to-load-path (string-append (if (getenv "XDG_CONFIG_HOME") (getenv "XDG_CONFIG_HOME") (string-append (getenv "HOME") "/.config")) "/yammer")) (load-from-path "config") (use-modules (yammer)) (start using-fftw? using-pulse? source source-type pulse-latency bitrate sample-factor fps resolution scale color bgcolor queue-size fft interpolation smoothing-mode moving-average-block-size exponential-factor)