factor: trim using lists

[factor.git] / extra / audio / engine / engine.factor

diff --git a/extra/audio/engine/engine.factor b/extra/audio/engine/engine.factor
index 9932953822e9d7037c89ec0159a55aba30cefc02..efc71cc34dab4605d9e2999de8ad966250bae8f4 100644 (file)
--- a/extra/audio/engine/engine.factor
+++ b/extra/audio/engine/engine.factor
@@ -1,8 +1,9 @@
-! (c)2009 Joe Groff bsd license
-USING: accessors alien alien.data audio classes.struct fry
-calendar timers combinators combinators.short-circuit
-destructors generalizations kernel literals locals math openal
-sequences sequences.generalizations specialized-arrays strings ;
+! Copyright (C) 2009 Joe Groff.
+! See http://factorcode.org/license.txt for BSD license.
+USING: accessors alien alien.data audio calendar
+combinators combinators.short-circuit destructors kernel
+literals math openal sequences sequences.generalizations
+specialized-arrays timers ;
 QUALIFIED-WITH: alien.c-types c
 SPECIALIZED-ARRAYS: c:float c:uchar c:uint ;
 IN: audio.engine
@@ -15,11 +16,11 @@ TUPLE: audio-source
     { distance float initial: 1.0 }
     { rolloff float initial: 1.0 } ;
 
-TUPLE: audio-orientation
+TUPLE: audio-orientation-state
     { forward initial: { 0.0 0.0 -1.0 } }
     { up initial: { 0.0 1.0 0.0 } } ;
 
-C: <audio-orientation> audio-orientation
+C: <audio-orientation-state> audio-orientation-state
 
 : orientation>float-array ( orientation -- float-array )
     [ forward>> first3 ]
@@ -29,7 +30,7 @@ TUPLE: audio-listener
     { position initial: { 0.0 0.0 0.0 } }
     { gain float initial: 1.0 }
     { velocity initial: { 0.0 0.0 0.0 } }
-    { orientation initial: T{ audio-orientation } } ;
+    { orientation initial: T{ audio-orientation-state } } ;
 
 GENERIC: audio-position ( source/listener -- position )
 GENERIC: audio-gain ( source/listener -- gain )
@@ -45,7 +46,7 @@ M: object audio-velocity drop { 0.0 0.0 0.0 } ; inline
 M: object audio-relative? drop f ; inline
 M: object audio-distance drop 1.0 ; inline
 M: object audio-rolloff drop 1.0 ; inline
-M: object audio-orientation drop T{ audio-orientation } ; inline
+M: object audio-orientation drop T{ audio-orientation-state } ; inline
 
 M: audio-source audio-position position>> ; inline
 M: audio-source audio-gain gain>> ; inline
@@ -118,7 +119,7 @@ ERROR: audio-context-not-available device-name ;
     al-context>> alcMakeContextCurrent drop ; inline
 
 : allocate-sources ( audio-engine -- sources )
-    voice-count>> dup (uint-array) [ alGenSources ] keep ; inline
+    voice-count>> dup c:uint (c-array) [ alGenSources ] keep ; inline
 
 :: flush-source ( al-source -- )
     al-source alSourceStop
@@ -198,7 +199,7 @@ M:: streaming-audio-clip (update-audio-clip) ( audio-clip -- )
 
 : update-audio-clip ( audio-clip -- )
     [ update-source ] [
-        dup al-source>> AL_SOURCE_STATE get-source-param AL_STOPPED = 
+        dup al-source>> AL_SOURCE_STATE get-source-param AL_STOPPED =
         [ dispose ] [ (update-audio-clip) ] if
     ] bi ;
 
@@ -277,7 +278,7 @@ M: audio-engine dispose*
     audio-engine get-available-source :> al-source
 
     al-source [
-        buffer-count dup (uint-array) [ alGenBuffers ] keep :> al-buffers
+        buffer-count dup c:uint (c-array) [ alGenBuffers ] keep :> al-buffers
         generator generator-audio-format :> ( channels sample-bits sample-rate )
 
         streaming-audio-clip new-disposable
@@ -319,7 +320,7 @@ M: streaming-audio-clip dispose*
 : play-static-audio-clip ( audio-engine source audio loop? -- audio-clip/f )
     <static-audio-clip> dup [ play-clip ] when* ;
 
-: play-streaming-audio-clip ( audio-engine source generator buffer-count -- audio-clip/f ) 
+: play-streaming-audio-clip ( audio-engine source generator buffer-count -- audio-clip/f )
     <streaming-audio-clip> dup [ play-clip ] when* ;
 
 : pause-clip ( audio-clip -- )
@@ -341,4 +342,3 @@ M: streaming-audio-clip dispose*
         [ update-listener ]
         [ clips>> clone [ update-audio-clip ] each ]
     } cleave ;
-