diff src/scheme/audio.scm @ 1:5df24c91468d

Oh my what a mess.

--- a/src/scheme/audio.scm	Tue Jan 17 17:50:20 2012 +0000
+++ b/src/scheme/audio.scm	Fri Apr 05 16:26:00 2019 +0100
@@ -23,6 +23,7 @@
 
 ;;; construct DataLine.Info. args = (format [bufsize])
 (define (_dli cl args) (apply javax.sound.sampled.DataLine$Info. (cons cl args)))
+(define (_open x) (.open x) x)
 (define (target-info . args) (_dli javax.sound.sampled.TargetDataLine.class args))
 (define (source-info . args) (_dli javax.sound.sampled.SourceDataLine.class args))
 
@@ -44,14 +45,14 @@
 
 (define-method (linesrc) 				(linesrc (default-format)))
 (define-method (linesnk) 				(linesnk (default-format)))
-(define-method (linesrc fmt) 			(.open (_src (line (target-info fmt)) fmt)))
-(define-method (linesnk fmt) 			(.open (_snk (line (source-info fmt bf)) fmt))) 
-(define-method (linesrc mx fmt)		(.open (_src (line mx (target-info fmt)) fmt)))
-(define-method (linesnk mx fmt)		(.open (_snk (line mx (source-info fmt)) fmt)))
-(define-method (linesrc mx fmt bf)	(.open (_sbs bf (_src (line mx (target-info fmt bf)) fmt))))
-(define-method (linesnk mx fmt bf)	(.open (_sbs bf (_snk (line mx (source-info fmt bf)) fmt))))
-(define-method (linesrc-buf fmt bf) (.open (_sbs bf (_src (line (target-info fmt bf)) fmt))))
-(define-method (linesnk-buf fmt bf) (.open (_sbs bf (_snk (line (source-info fmt bf)) fmt))))
+(define-method (linesrc fmt) 			(_open (_src (line (target-info fmt)) fmt)))
+(define-method (linesnk fmt) 			(_open (_snk (line (source-info fmt)) fmt))) 
+(define-method (linesrc mx fmt)		(_open (_src (line mx (target-info fmt)) fmt)))
+(define-method (linesnk mx fmt)		(_open (_snk (line mx (source-info fmt)) fmt)))
+(define-method (linesrc mx fmt bf)	(_open (_sbs bf (_src (line mx (target-info fmt bf)) fmt))))
+(define-method (linesnk mx fmt bf)	(_open (_sbs bf (_snk (line mx (source-info fmt bf)) fmt))))
+(define-method (linesrc-buf fmt bf) (_open (_sbs bf (_src (line (target-info fmt bf)) fmt))))
+(define-method (linesnk-buf fmt bf) (_open (_sbs bf (_snk (line (source-info fmt bf)) fmt))))
 (define filesnk samer.audio.FileSink.)
 
 (define streamsrc samer.audio.StreamSource.)
@@ -72,7 +73,7 @@
 
 ;;; buffering audio input into frames with a certain hop size
 (define-method (linein size step) (linein (linesrc) size step))
-(define-method (linein (source samer.audio.AudioSource) size step)
+(define-method (linein source size step)
 	(define line (LineIn. source size step))
 	(put "LineIn" line)
 	(addtask line)