Merge branch 'main' of https://git.dijkewijk.nl/hans/racket-sound

libflac-ffi.rkt

@@ -402,7 +402,8 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (define _FLAC__StreamDecoder-pointer (_cpointer 'flac-streamdecoder))
-(define _FLAC__Data-pointer (_cpointer 'flac-client-data))
+(define _FLAC__Data-pointer (_cpointer/null 'flac-client-data))
+;(define _FLAC__StreamMetadata-pointer (_cpointer/null 'flac-stream-metadata))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; FLAC Callback function definitions
@@ -414,18 +415,21 @@
   (_fun _FLAC__StreamDecoder-pointer
         _FLAC__Frame-pointer
         FLAC__int32** 
-        _FLAC__Data-pointer -> _int))
+        _FLAC__Data-pointer
+        -> _int))
 
 ;typedef void(* FLAC__StreamDecoderMetadataCallback) (const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
 (define _FLAC__StreamDecoderMetadataCallback
   (_fun _FLAC__StreamDecoder-pointer
         _FLAC__StreamMetadata-pointer
-        _FLAC__Data-pointer -> _void))
+        _FLAC__Data-pointer
+        -> _void))
 
 (define _FLAC__StreamDecoderErrorCallback
   (_fun _FLAC__StreamDecoder-pointer
         _int
-        _FLAC__Data-pointer -> _void))
+        _FLAC__Data-pointer
+        -> _void))
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -464,6 +468,7 @@
         _FLAC__StreamDecoderWriteCallback
         _FLAC__StreamDecoderMetadataCallback
         _FLAC__StreamDecoderErrorCallback
+        _FLAC__Data-pointer  ; Seen by Jens Axel Søgaard - Is already present in FLAC 1.4.3 
         -> _int))
 
 (define-libflac FLAC__stream_decoder_process_single
@@ -478,6 +483,16 @@
   (_fun _FLAC__StreamDecoder-pointer FLAC__uint64
           -> _bool))
 
+;FLAC_API FLAC__StreamMetadata *FLAC__metadata_object_clone(const FLAC__StreamMetadata *object);
+(define-libflac FLAC__metadata_object_clone
+  (_fun _FLAC__StreamMetadata-pointer
+        -> _FLAC__StreamMetadata-pointer))
+  
+;FLAC_API void FLAC__metadata_object_delete(FLAC__StreamMetadata *object);
+(define-libflac FLAC__metadata_object_delete
+  (_fun _FLAC__StreamMetadata-pointer
+        -> _void))
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Our interface for decoding to racket
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -488,15 +503,18 @@
   (define error-no -1)
   (define fl #f)
   (define flac-file #f)
+  (define client-data #f)
   
-  (define (write-callback fl frame buffer data)
+  (define (write-callback fl frame buffer client-data)
     (set! write-data (append write-data (list (cons frame buffer))))
     0)
 
-  (define (meta-callback fl meta data)
-    (set! meta-data (append meta-data (list meta))))
+  (define (meta-callback fl meta client-data)
+    (let ((meta-clone (FLAC__metadata_object_clone meta)))
+      (unless (eq? meta-clone #f)
+        (set! meta-data (append meta-data (list meta-clone))))))
 
-  (define (error-callback fl errno data)
+  (define (error-callback fl errno client-data)
     (set! error-no errno)
     )
 
@@ -506,11 +524,12 @@
 
   (define (init file)
     (let ((r (FLAC__stream_decoder_init_file
-             fl
-             file
-             write-callback
-             meta-callback
-             error-callback)))
+              fl
+              file
+              write-callback
+              meta-callback
+              error-callback
+              client-data)))
       (set! flac-file file)
       r))
 
@@ -524,7 +543,10 @@
     (decoder-state (int-state)))
 
   (define (process-meta-data cb)
-    (for-each cb meta-data)
+    (for-each (λ (meta-entry)
+                (cb meta-entry)
+                (FLAC__metadata_object_delete meta-entry))
+              meta-data)
     (set! meta-data '()))
 
   (define (process-write-data cb)