From 24b39bee60aa95d1c9eb7baed6b55213fa00bc5b Mon Sep 17 00:00:00 2001 From: Hans Dijkema Date: Sun, 22 Feb 2026 23:15:08 +0100 Subject: [PATCH] - --- libao/c/Makefile | 5 +++- libao/c/ao-play-async/ao_playasync.c | 43 +++++++++++++++++++-------- libao/c/ao-play-async/ao_playasync.h | 7 ++++- libao/lib/libao-play-async.so | Bin 0 -> 16536 bytes libao/libao-async-ffi.rkt | 20 +++++++++---- libao/libao-ffi.rkt | 22 +++++++++----- play-test.rkt | 32 ++++++++++++++++---- utils/utils.rkt | 4 +++ 8 files changed, 101 insertions(+), 32 deletions(-) create mode 100755 libao/lib/libao-play-async.so diff --git a/libao/c/Makefile b/libao/c/Makefile index dc4ced9..068d54d 100644 --- a/libao/c/Makefile +++ b/libao/c/Makefile @@ -5,7 +5,10 @@ all: (cd build; make) install: - (cd build; cp *.so /usr/local/lib) + mkdir -p ../lib + FILES=`ls build/*.so` 2>/dev/null; if [ "$$FILES" != "" ]; then cp $$FILES ../lib; fi + FILES=`ls build/*.dll` 2>/dev/null; if [ "$$FILES" != "" ]; then cp $$FILES ../lib; fi + clean: rm -rf build diff --git a/libao/c/ao-play-async/ao_playasync.c b/libao/c/ao-play-async/ao_playasync.c index ec5ae59..4da7911 100644 --- a/libao/c/ao-play-async/ao_playasync.c +++ b/libao/c/ao-play-async/ao_playasync.c @@ -4,7 +4,7 @@ #include #include #include -#include +//#include #include #include #include @@ -26,15 +26,17 @@ typedef struct _queue_ { } Queue_t; typedef struct { - Queue_t *play_queue; - Queue_t *last_frame; - ao_device *ao_device; + Queue_t *play_queue; + Queue_t *last_frame; + ao_device *ao_device; pthread_mutex_t mutex; - pthread_t thread; - double at_second; + pthread_t thread; + double at_second; + ao_play_func_t ao_play_f; + int buf_size; } AO_Handle; -static int(*ao_play)(void *device, char *samples, uint32_t n) = NULL; +//static int(*ao_play)(void *device, char *samples, uint32_t n) = NULL; static Queue_t *front(AO_Handle *h) @@ -53,6 +55,7 @@ static Queue_t *get(AO_Handle *h) } else { h->play_queue->prev = NULL; } + h->buf_size -= q->buflen; return q; } @@ -69,6 +72,7 @@ static void add(AO_Handle *h, Queue_t *elem) elem->next = NULL; h->last_frame = elem; } + h->buf_size += elem->buflen; } static Queue_t *new_elem(int command, double at_second, int buf_len, void *buf) @@ -125,7 +129,7 @@ static void *run(void *arg) if (q->command == STOP) { go_on = (1 == 0); } else { - ao_play(handle->ao_device, q->buf, q->buflen); + handle->ao_play_f(handle->ao_device, q->buf, q->buflen); } del_elem(q); @@ -138,6 +142,7 @@ static void *run(void *arg) return NULL; } +/* static void get_ao_play(void) { char *lib = "libao.so"; @@ -155,11 +160,12 @@ static void get_ao_play(void) exit(EXIT_FAILURE); } } +*/ -void *ao_create_async(void *ao_device_yeah) +void *ao_create_async(void *ao_device_yeah, void *ao_play_f) { - if (ao_play == NULL) { get_ao_play(); } + //if (ao_play == NULL) { get_ao_play(); } AO_Handle *handle = (AO_Handle *) malloc(sizeof(AO_Handle)); @@ -169,6 +175,8 @@ void *ao_create_async(void *ao_device_yeah) handle->at_second = -1; pthread_mutex_t m = PTHREAD_MUTEX_INITIALIZER; handle->mutex = m; + handle->ao_play_f = ao_play_f; + handle->buf_size = 0; pthread_create(&handle->thread, NULL, run, handle); @@ -202,8 +210,19 @@ void ao_play_async(void *ao_handle, double at_second, int buf_size, void *mem) double ao_is_at_second_async(void *ao_handle) { AO_Handle *h = (AO_Handle *) ao_handle; - return h->at_second; + pthread_mutex_lock(&h->mutex); + double s = h->at_second; + pthread_mutex_unlock(&h->mutex); + return s; +} + +int ao_bufsize_async(void *ao_handle) +{ + AO_Handle *h = (AO_Handle *) ao_handle; + pthread_mutex_lock(&h->mutex); + int s = h->buf_size; + pthread_mutex_unlock(&h->mutex); + return s; } - diff --git a/libao/c/ao-play-async/ao_playasync.h b/libao/c/ao-play-async/ao_playasync.h index 4aeb12e..d0c9dfb 100644 --- a/libao/c/ao-play-async/ao_playasync.h +++ b/libao/c/ao-play-async/ao_playasync.h @@ -1,9 +1,14 @@ #ifndef AO_PLAYASYNC_H #define AO_PLAYASYNC_H -extern void *ao_create_async(void *ao_handle); +#include + +typedef int(*ao_play_func_t)(void *, char *, uint32_t); + +extern void *ao_create_async(void *ao_handle, void *ao_play_f); extern void ao_stop_async(void *handle); extern void ao_play_async(void *handle, double at_second, int buf_size, void *mem); extern double ao_is_at_second_async(void *handle); +extern int ao_bufsize_async(void *handle); #endif // AO_PLAYASYNC_H diff --git a/libao/lib/libao-play-async.so b/libao/lib/libao-play-async.so new file mode 100755 index 0000000000000000000000000000000000000000..aaa58bb39ca15e7ea4d303096d4978f255ca0aae GIT binary patch literal 16536 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 literal 0 HcmV?d00001 diff --git a/libao/libao-async-ffi.rkt b/libao/libao-async-ffi.rkt index 91e0003..324aae9 100644 --- a/libao/libao-async-ffi.rkt +++ b/libao/libao-async-ffi.rkt @@ -5,27 +5,32 @@ ffi/unsafe/define setup/dirs "../utils/utils.rkt" + racket/runtime-path + "libao-ffi.rkt" ) (provide ao_create_async ao_stop_async ao_play_async ao_is_at_second_async + ao_bufsize_async ) -;(ffi-lib "/usr/local/lib/libao-play-async.so") +(define-runtime-path libao-async-path "./lib/libao-play-async") (define-ffi-definer define-libao-async - (ffi-lib "libao-play-async" '("0" #f) - #:get-lib-dirs (lambda () - (cons (build-path ".") (get-lib-search-dirs))) + (ffi-lib libao-async-path '("0" #f) + #:get-lib-dirs (λ () + (let ((sp (cons (build-path ".") (get-lib-search-dirs)))) + (displayln sp) + sp)) #:fail (λ () (error "Cannot load libao-play-async")) )) (define _libao-async-handle-pointer (_cpointer 'ao-async-handle)) -;extern void *ao_create_async(void *ao_device); -(define-libao-async ao_create_async(_fun _pointer -> _libao-async-handle-pointer)) +;extern void *ao_create_async(void *ao_device, ); +(define-libao-async ao_create_async(_fun _pointer _fpointer -> _libao-async-handle-pointer)) ;extern void ao_stop_async(void *handle); (define-libao-async ao_stop_async(_fun _libao-async-handle-pointer -> _void)) @@ -35,3 +40,6 @@ ;extern double ao_is_at_second_async(void *handle); (define-libao-async ao_is_at_second_async(_fun _libao-async-handle-pointer -> _double)) + +;extern int ao_bufsize_async(void *handle); +(define-libao-async ao_bufsize_async(_fun _libao-async-handle-pointer -> _int)) \ No newline at end of file diff --git a/libao/libao-ffi.rkt b/libao/libao-ffi.rkt index 08031ff..3447d83 100644 --- a/libao/libao-ffi.rkt +++ b/libao/libao-ffi.rkt @@ -13,6 +13,7 @@ ao_driver_id ao_open_live ao_play + ao_play_ptr ao_close ao_shutdown ao_append_option @@ -26,15 +27,18 @@ ) -(define-ffi-definer define-libao - (ffi-lib "libao" '("3" "4" "5" #f) - #:get-lib-dirs (lambda () - (cons (build-path ".") (get-lib-search-dirs))) - #:fail (lambda () - (ffi-lib (get-lib-path "libao-4.dll"))) - )) +(define ao_lib (ffi-lib "libao" '("3" "4" "5" #f) + #:get-lib-dirs (λ () + (let ((sp (cons (build-path ".") (get-lib-search-dirs)))) + (displayln sp) + sp)) + #:fail (λ () + (ffi-lib (get-lib-path "libao-4.dll"))) + )) +(define-ffi-definer define-libao ao_lib) + (define _libao-pointer (_cpointer 'ao_device)) (define-cstruct _ao_sample_format ( [bits _int] ; bits per sample @@ -66,6 +70,10 @@ ; int ao_play(ao_device *device, char *output_samples, uint_32 num_bytes); (define-libao ao_play (_fun _libao-pointer _pointer _uint32 -> _int)) +(define ao_play_ptr (get-ffi-obj "ao_play" ao_lib _fpointer + (λ () (error 'ao_lib "libao does not provide 'ao_play'")) + )) + ; int ao_close(ao_device *device); (define-libao ao_close (_fun _libao-pointer -> _int)) diff --git a/play-test.rkt b/play-test.rkt index 65bda67..9b24c5f 100644 --- a/play-test.rkt +++ b/play-test.rkt @@ -16,14 +16,36 @@ (let* ((sample (hash-ref frame 'number)) (rate (hash-ref frame 'sample-rate)) (second (/ (* sample 1.0) (* rate 1.0))) + (bits-per-sample (hash-ref frame 'bits-per-sample)) + (bytes-per-sample (/ bits-per-sample 8)) + (channels (hash-ref frame 'channels)) + (bytes-per-sample-all-channels (* channels bytes-per-sample)) ) (ao-play ao-h second buffer) + (let ((second-printer (λ () + (let ((s (inexact->exact (round (ao-at-second ao-h))))) + (when (> s current-seconds) + (set! current-seconds s) + (displayln (format "At second: ~a" s))))))) + (let* ((buf-size (ao-bufsize-async ao-h)) + (buf-seconds (exact->inexact (/ buf-size bytes-per-sample-all-channels rate)))) + (second-printer) + (when (> buf-seconds 5) + (letrec ((waiter (λ () + (let ((buf-seconds-left (exact->inexact + (/ (ao-bufsize-async ao-h) + bytes-per-sample-all-channels + rate)))) + (if (< buf-seconds-left 2.0) + (displayln (format "Seconds in buffer left: ~a" buf-seconds-left)) + (begin + (sleep 0.5) + (second-printer) + (waiter))))) + )) + (waiter)))) + ) ) - (let ((s (inexact->exact (round (ao-at-second ao-h))))) - (when (> s current-seconds) - (set! current-seconds s) - (displayln (format "At second: ~a" (ao-at-second ao-h))) - )) ) (define (flac-meta meta) diff --git a/utils/utils.rkt b/utils/utils.rkt index 93cc9fc..a71ac5b 100644 --- a/utils/utils.rkt +++ b/utils/utils.rkt @@ -57,6 +57,10 @@ try1 try2) )] + [(eq? platform 'unix) + (let ((try1 (build-path (current-directory) "lib" lib))) + (when (file-exists? try1) + try1))] [else (error (format "Install the shared library: ~a" lib))] )))