Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

proxy callback delete #452

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

proxy callback delete #452

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2dca3ad
proxy callback delete
sonoro1234 Jan 21, 2025
3fb5c63
completely remove proxy callback
sonoro1234 Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions rtaudio_c.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
struct rtaudio {
RtAudio *audio;

rtaudio_cb_t cb;
void *userdata;

rtaudio_error_t errtype;
char errmsg[MAX_ERROR_MESSAGE_LENGTH];
};
Expand Down Expand Up @@ -123,12 +120,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,
Expand Down Expand Up @@ -169,10 +160,9 @@ 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, proxy_cb_func, (void *)audio, opts); //, NULL);
buffer_frames, cb, (void *)userdata, opts); //, NULL);
return audio->errtype;
}

Expand Down
Loading