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

Switched audio callback from function pointer to std::function #451

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Switched audio callback from function pointer to std::function #451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions RtAudio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -760,7 +760,7 @@ RtAudioErrorType RtApi :: openStream( RtAudio::StreamParameters *oParams,
return error( RTAUDIO_SYSTEM_ERROR );
}

stream_.callbackInfo.callback = (void *) callback;
stream_.callbackInfo.callback = callback;
stream_.callbackInfo.userData = userData;

if ( options ) options->numberOfBuffers = stream_.nBuffers;
Expand Down Expand Up @@ -2235,7 +2235,7 @@ bool RtApiCore :: callbackEvent( AudioDeviceID deviceId,
// draining stream or duplex mode AND the input/output devices are
// different AND this function is called for the input device.
if ( handle->drainCounter == 0 && ( stream_.mode != DUPLEX || deviceId == outputDevice ) ) {
RtAudioCallback callback = (RtAudioCallback) info->callback;
RtAudioCallback callback = info->callback;
double streamTime = getStreamTime();
RtAudioStreamStatus status = 0;
if ( stream_.mode != INPUT && handle->xrun[0] == true ) {
Expand Down Expand Up @@ -3241,7 +3241,7 @@ bool RtApiJack :: callbackEvent( unsigned long nframes )

// Invoke user callback first, to get fresh output data.
if ( handle->drainCounter == 0 ) {
RtAudioCallback callback = (RtAudioCallback) info->callback;
RtAudioCallback callback = info->callback;
double streamTime = getStreamTime();
RtAudioStreamStatus status = 0;
if ( stream_.mode != INPUT && handle->xrun[0] == true ) {
Expand Down Expand Up @@ -4130,7 +4130,7 @@ bool RtApiAsio :: callbackEvent( long bufferIndex )
// Invoke user callback to get fresh output data UNLESS we are
// draining stream.
if ( handle->drainCounter == 0 ) {
RtAudioCallback callback = (RtAudioCallback) info->callback;
RtAudioCallback callback = info->callback;
double streamTime = getStreamTime();
RtAudioStreamStatus status = 0;
if ( stream_.mode != INPUT && asioXRun == true ) {
Expand Down Expand Up @@ -5637,7 +5637,7 @@ void RtApiWasapi::wasapiThread()
WasapiResampler* renderResampler = NULL;

// declare local stream variables
RtAudioCallback callback = ( RtAudioCallback ) stream_.callbackInfo.callback;
RtAudioCallback callback = stream_.callbackInfo.callback;
BYTE* streamBuffer = NULL;
DWORD captureFlags = 0;
unsigned int bufferFrameCount = 0;
Expand Down Expand Up @@ -7330,7 +7330,7 @@ void RtApiDs :: callbackEvent()
// Invoke user callback to get fresh output data UNLESS we are
// draining stream.
if ( handle->drainCounter == 0 ) {
RtAudioCallback callback = (RtAudioCallback) info->callback;
RtAudioCallback callback = info->callback;
double streamTime = getStreamTime();
RtAudioStreamStatus status = 0;
if ( stream_.mode != INPUT && handle->xrun[0] == true ) {
Expand Down Expand Up @@ -8949,7 +8949,7 @@ void RtApiAlsa :: callbackEvent()
}

int doStopStream = 0;
RtAudioCallback callback = (RtAudioCallback) stream_.callbackInfo.callback;
RtAudioCallback callback = stream_.callbackInfo.callback;
double streamTime = getStreamTime();
RtAudioStreamStatus status = 0;
if ( stream_.mode != INPUT && apiInfo->xrun[0] == true ) {
Expand Down Expand Up @@ -9753,7 +9753,7 @@ void RtApiPulse::callbackEvent( void )
return;
}

RtAudioCallback callback = (RtAudioCallback) stream_.callbackInfo.callback;
RtAudioCallback callback = stream_.callbackInfo.callback;
double streamTime = getStreamTime();
RtAudioStreamStatus status = 0;
int doStopStream = callback( stream_.userBuffer[OUTPUT], stream_.userBuffer[INPUT],
Expand Down Expand Up @@ -10766,7 +10766,7 @@ void RtApiOss :: callbackEvent()

// Invoke user callback to get fresh output data.
int doStopStream = 0;
RtAudioCallback callback = (RtAudioCallback) stream_.callbackInfo.callback;
RtAudioCallback callback = stream_.callbackInfo.callback;
double streamTime = getStreamTime();
RtAudioStreamStatus status = 0;
if ( stream_.mode != INPUT && handle->xrun[0] == true ) {
Expand Down
13 changes: 7 additions & 6 deletions RtAudio.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,11 +219,12 @@ static const RtAudioStreamStatus RTAUDIO_OUTPUT_UNDERFLOW = 0x2; // The output
output buffer, the function should return a value of one. To abort
the stream immediately, the client should return a value of two.
*/
typedef int (*RtAudioCallback)( void *outputBuffer, void *inputBuffer,
unsigned int nFrames,
double streamTime,
RtAudioStreamStatus status,
void *userData );

typedef std::function<int(void* outputBuffer, void* inputBuffer,
unsigned int nFrames,
double streamTime,
RtAudioStreamStatus status,
void* userData)> RtAudioCallback;

enum RtAudioErrorType {
RTAUDIO_NO_ERROR = 0, /*!< No error. */
Expand Down Expand Up @@ -684,7 +685,7 @@ class RTAUDIO_DLL_PUBLIC RtAudio
struct CallbackInfo {
void *object{}; // Used as a "this" pointer.
ThreadHandle thread{};
void *callback{};
RtAudioCallback callback{};
void *userData{};
void *apiInfo{}; // void pointer for API specific callback information
bool isRunning{false};
Expand Down
Loading