update C-STRUCT:s in audio.wav

diff --git a/extra/audio/wav/wav.factor b/extra/audio/wav/wav.factor
index 4df8b524243240b2a321f0e7003fcd9d2fad6f24..89cd04ad60edff3ca6b916d3c5d79d73b2f17ac1 100644 (file)
--- a/extra/audio/wav/wav.factor
+++ b/extra/audio/wav/wav.factor
@@ -1,7 +1,7 @@
 USING: alien.c-types alien.syntax audio combinators
 combinators.short-circuit io io.binary io.encodings.binary
 io.files io.streams.byte-array kernel locals math
-sequences alien.data ;
+sequences alien alien.data classes.struct accessors ;
 IN: audio.wav
 
 CONSTANT: RIFF-MAGIC "RIFF"
@@ -9,30 +9,26 @@ CONSTANT: WAVE-MAGIC "WAVE"
 CONSTANT: FMT-MAGIC  "fmt "
 CONSTANT: DATA-MAGIC "data"
 
-C-STRUCT: riff-chunk-header
-    { "char[4]" "id" }
-    { "uchar[4]" "size" }
-    ;
+STRUCT: riff-chunk-header
+    { id char[4] }
+    { size char[4] } ;
 
-C-STRUCT: riff-chunk
-    { "riff-chunk-header" "header" }
-    { "char[4]" "format" }
-    ;
+STRUCT: riff-chunk
+    { header riff-chunk-header }
+    { format char[4] } ;
 
-C-STRUCT: wav-fmt-chunk
-    { "riff-chunk-header" "header" }
-    { "uchar[2]" "audio-format" }
-    { "uchar[2]" "num-channels" }
-    { "uchar[4]" "sample-rate" }
-    { "uchar[4]" "byte-rate" }
-    { "uchar[2]" "block-align" }
-    { "uchar[2]" "bits-per-sample" }
-    ;
+STRUCT: wav-fmt-chunk
+    { header riff-chunk-header }
+    { audio-format uchar[2] }
+    { num-channels uchar[2] }
+    { sample-rate uchar[4] }
+    { byte-rate uchar[4] }
+    { block-align uchar[2] }
+    { bits-per-sample uchar[2] } ;
 
-C-STRUCT: wav-data-chunk
-    { "riff-chunk-header" "header" }
-    { "uchar[0]" "body" }
-    ;
+STRUCT: wav-data-chunk
+    { header riff-chunk-header }
+    { body uchar[0] } ;
 
 ERROR: invalid-wav-file ;
 
@@ -44,39 +40,39 @@ ERROR: invalid-wav-file ;
 : read-chunk ( -- byte-array/f )
     4 ensured-read [ 4 ensured-read* dup le> ensured-read* 3append ] [ f ] if* ;
 : read-riff-chunk ( -- byte-array/f )
-    "riff-chunk" heap-size ensured-read* ;
+    riff-chunk heap-size ensured-read* ;
 
 : id= ( chunk id -- ? )
-    [ 4 head ] dip sequence= ;
+    [ 4 head ] dip sequence= ; inline
 
-: check-chunk ( chunk id min-size -- ? )
-    [ id= ] [ [ length ] dip >= ] bi-curry* bi and ;
+: check-chunk ( chunk id class -- ? )
+    heap-size [ id= ] [ [ length ] dip >= ] bi-curry* bi and ;
 
 :: read-wav-chunks ( -- fmt data )
     f :> fmt! f :> data!
     [ { [ fmt data and not ] [ read-chunk ] } 0&& dup ]
     [ {
-        { [ dup FMT-MAGIC  "wav-fmt-chunk"  heap-size check-chunk ] [ fmt!  ] }
-        { [ dup DATA-MAGIC "wav-data-chunk" heap-size check-chunk ] [ data! ] }
+        { [ dup FMT-MAGIC  wav-fmt-chunk  check-chunk ] [ wav-fmt-chunk  memory>struct fmt!  ] }
+        { [ dup DATA-MAGIC wav-data-chunk check-chunk ] [ wav-data-chunk memory>struct data! ] }
     } cond ] while drop
     fmt data 2dup and [ invalid-wav-file ] unless ;
 
 : verify-wav ( chunk -- )
     {
         [ RIFF-MAGIC id= ]
-        [ riff-chunk-format 4 memory>byte-array WAVE-MAGIC id= ]
+        [ riff-chunk memory>struct format>> 4 memory>byte-array WAVE-MAGIC id= ]
     } 1&&
     [ invalid-wav-file ] unless ;
 
 : (read-wav) ( -- audio )
     read-wav-chunks
     [
-        [ wav-fmt-chunk-num-channels    2 memory>byte-array le> ]
-        [ wav-fmt-chunk-bits-per-sample 2 memory>byte-array le> ]
-        [ wav-fmt-chunk-sample-rate     4 memory>byte-array le> ] tri
+        [ num-channels>>    2 memory>byte-array le> ]
+        [ bits-per-sample>> 2 memory>byte-array le> ]
+        [ sample-rate>>     4 memory>byte-array le> ] tri
     ] [
-        [ riff-chunk-header-size 4 memory>byte-array le> dup ]
-        [ wav-data-chunk-body ] bi swap memory>byte-array
+        [ header>> size>> 4 memory>byte-array le> dup ]
+        [ body>> >c-ptr ] bi swap memory>byte-array
     ] bi* <audio> ;
 
 : read-wav ( filename -- audio )