From 2dca3ad96f613c7d7d06e1728adec61a58e4b793 Mon Sep 17 00:00:00 2001 From: sonoro1234 Date: Tue, 21 Jan 2025 11:13:54 +0100 Subject: [PATCH 1/2] proxy callback delete --- rtaudio_c.cpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/rtaudio_c.cpp b/rtaudio_c.cpp index cdd491c0..9876958f 100644 --- a/rtaudio_c.cpp +++ b/rtaudio_c.cpp @@ -123,12 +123,6 @@ unsigned int rtaudio_get_default_input_device(rtaudio_t audio) { return audio->audio->getDefaultInputDevice(); } -static int proxy_cb_func(void *out, void *in, unsigned int nframes, double time, - RtAudioStreamStatus status, void *userdata) { - rtaudio_t audio = (rtaudio_t)userdata; - return audio->cb(out, in, nframes, time, (rtaudio_stream_status_t)status, - audio->userdata); -} rtaudio_error_t rtaudio_open_stream(rtaudio_t audio, rtaudio_stream_parameters_t *output_params, @@ -169,10 +163,10 @@ rtaudio_error_t rtaudio_open_stream(rtaudio_t audio, } opts = &stream_opts; } - audio->cb = cb; - audio->userdata = userdata; + //audio->cb = cb; + //audio->userdata = userdata; audio->audio->openStream(out, in, (RtAudioFormat)format, sample_rate, - buffer_frames, proxy_cb_func, (void *)audio, opts); //, NULL); + buffer_frames, cb, (void *)userdata, opts); //, NULL); return audio->errtype; } From 3fb5c635ff025ee6e63d54981f805201db67100b Mon Sep 17 00:00:00 2001 From: sonoro1234 Date: Tue, 21 Jan 2025 11:21:25 +0100 Subject: [PATCH 2/2] completely remove proxy callback --- rtaudio_c.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/rtaudio_c.cpp b/rtaudio_c.cpp index 9876958f..9cfa4586 100644 --- a/rtaudio_c.cpp +++ b/rtaudio_c.cpp @@ -8,9 +8,6 @@ struct rtaudio { RtAudio *audio; - rtaudio_cb_t cb; - void *userdata; - rtaudio_error_t errtype; char errmsg[MAX_ERROR_MESSAGE_LENGTH]; }; @@ -163,8 +160,7 @@ rtaudio_error_t rtaudio_open_stream(rtaudio_t audio, } opts = &stream_opts; } - //audio->cb = cb; - //audio->userdata = userdata; + audio->audio->openStream(out, in, (RtAudioFormat)format, sample_rate, buffer_frames, cb, (void *)userdata, opts); //, NULL); return audio->errtype;