diff --git a/examples/audio/audio_mixed_processor.c b/examples/audio/audio_mixed_processor.c index fd970dd19..d5a4c4e0e 100644 --- a/examples/audio/audio_mixed_processor.c +++ b/examples/audio/audio_mixed_processor.c @@ -21,7 +21,7 @@ static float averageVolume[400] = { 0.0f }; // Average volume history //------------------------------------------------------------------------------------ // Audio processing function //------------------------------------------------------------------------------------ -void ProcessAudio(void *buffer, unsigned int frames) +unsigned int ProcessAudio(void *buffer, unsigned int frames, void* userData) { float *samples = (float *)buffer; // Samples internally stored as s float average = 0.0f; // Temporary average volume @@ -41,6 +41,8 @@ void ProcessAudio(void *buffer, unsigned int frames) for (int i = 0; i < 399; i++) averageVolume[i] = averageVolume[i + 1]; averageVolume[399] = average; // Adding last average value + + return frames; } //------------------------------------------------------------------------------------ @@ -57,7 +59,7 @@ int main(void) InitAudioDevice(); // Initialize audio device - AttachAudioMixedProcessor(ProcessAudio); + AttachAudioMixedProcessor(ProcessAudio, NULL); Music music = LoadMusicStream("resources/country.mp3"); Sound sound = LoadSound("resources/coin.wav"); diff --git a/examples/audio/audio_raw_stream.c b/examples/audio/audio_raw_stream.c index 0b7954293..0f8224a76 100644 --- a/examples/audio/audio_raw_stream.c +++ b/examples/audio/audio_raw_stream.c @@ -35,7 +35,7 @@ float oldFrequency = 1.0f; float sineIdx = 0.0f; // Audio input processing callback -void AudioInputCallback(void *buffer, unsigned int frames) +unsigned int AudioInputCallback(void *buffer, unsigned int frames, void* userData) { audioFrequency = frequency + (audioFrequency - frequency)*0.95f; @@ -48,6 +48,8 @@ void AudioInputCallback(void *buffer, unsigned int frames) sineIdx += incr; if (sineIdx > 1.0f) sineIdx -= 1.0f; } + + return frames; } //------------------------------------------------------------------------------------ @@ -69,7 +71,7 @@ int main(void) // Init raw audio stream (sample rate: 44100, sample size: 16bit-short, channels: 1-mono) AudioStream stream = LoadAudioStream(44100, 16, 1); - SetAudioStreamCallback(stream, AudioInputCallback); + SetAudioStreamCallback(stream, AudioInputCallback, NULL); // Buffer for the single cycle waveform we are synthesizing short *data = (short *)malloc(sizeof(short)*MAX_SAMPLES); diff --git a/examples/audio/audio_stream_effects.c b/examples/audio/audio_stream_effects.c index cc8273abc..f0dd40e2f 100644 --- a/examples/audio/audio_stream_effects.c +++ b/examples/audio/audio_stream_effects.c @@ -24,8 +24,8 @@ static unsigned int delayWriteIndex = 0; //------------------------------------------------------------------------------------ // Module Functions Declaration //------------------------------------------------------------------------------------ -static void AudioProcessEffectLPF(void *buffer, unsigned int frames); // Audio effect: lowpass filter -static void AudioProcessEffectDelay(void *buffer, unsigned int frames); // Audio effect: delay +static unsigned int AudioProcessEffectLPF(void *buffer, unsigned int frames, void* userData); // Audio effect: lowpass filter +static unsigned int AudioProcessEffectDelay(void *buffer, unsigned int frames, void* userData); // Audio effect: delay //------------------------------------------------------------------------------------ // Program main entry point @@ -85,7 +85,7 @@ int main(void) if (IsKeyPressed(KEY_F)) { enableEffectLPF = !enableEffectLPF; - if (enableEffectLPF) AttachAudioStreamProcessor(music.stream, AudioProcessEffectLPF); + if (enableEffectLPF) AttachAudioStreamProcessor(music.stream, AudioProcessEffectLPF, NULL); else DetachAudioStreamProcessor(music.stream, AudioProcessEffectLPF); } @@ -93,7 +93,7 @@ int main(void) if (IsKeyPressed(KEY_D)) { enableEffectDelay = !enableEffectDelay; - if (enableEffectDelay) AttachAudioStreamProcessor(music.stream, AudioProcessEffectDelay); + if (enableEffectDelay) AttachAudioStreamProcessor(music.stream, AudioProcessEffectDelay, NULL); else DetachAudioStreamProcessor(music.stream, AudioProcessEffectDelay); } @@ -143,7 +143,7 @@ int main(void) // Module Functions Definition //------------------------------------------------------------------------------------ // Audio effect: lowpass filter -static void AudioProcessEffectLPF(void *buffer, unsigned int frames) +static unsigned int AudioProcessEffectLPF(void *buffer, unsigned int frames, void* userData) { static float low[2] = { 0.0f, 0.0f }; static const float cutoff = 70.0f / 44100.0f; // 70 Hz lowpass filter @@ -161,10 +161,12 @@ static void AudioProcessEffectLPF(void *buffer, unsigned int frames) bufferData[i] = low[0]; bufferData[i + 1] = low[1]; } + + return frames; } // Audio effect: delay -static void AudioProcessEffectDelay(void *buffer, unsigned int frames) +static unsigned int AudioProcessEffectDelay(void *buffer, unsigned int frames, void* userData) { for (unsigned int i = 0; i < frames*2; i += 2) { @@ -180,4 +182,6 @@ static void AudioProcessEffectDelay(void *buffer, unsigned int frames) delayBuffer[delayWriteIndex++] = ((float *)buffer)[i + 1]; if (delayWriteIndex == delayBufferSize) delayWriteIndex = 0; } + + return frames; } diff --git a/src/raudio.c b/src/raudio.c index 21d1adae3..484980873 100644 --- a/src/raudio.c +++ b/src/raudio.c @@ -343,6 +343,7 @@ struct rAudioBuffer { ma_data_converter converter; // Audio data converter AudioCallback callback; // Audio buffer callback for buffer filling on audio threads + void* userData; // User data forwarded to the callback rAudioProcessor *processor; // Audio processor float volume; // Audio buffer volume @@ -369,6 +370,7 @@ struct rAudioBuffer { // NOTE: Useful to apply effects to an AudioBuffer struct rAudioProcessor { AudioCallback process; // Processor callback function + void* userData; // User data forwarded to the callback rAudioProcessor *next; // Next audio processor on the list rAudioProcessor *prev; // Previous audio processor on the list }; @@ -445,6 +447,7 @@ void PlayAudioBuffer(AudioBuffer *buffer); void StopAudioBuffer(AudioBuffer *buffer); void PauseAudioBuffer(AudioBuffer *buffer); void ResumeAudioBuffer(AudioBuffer *buffer); +void SetAudioBufferLooping(AudioBuffer* buffer, bool loop); void SetAudioBufferVolume(AudioBuffer *buffer, float volume); void SetAudioBufferPitch(AudioBuffer *buffer, float pitch); void SetAudioBufferPan(AudioBuffer *buffer, float pan); @@ -596,6 +599,7 @@ AudioBuffer *LoadAudioBuffer(ma_format format, ma_uint32 channels, ma_uint32 sam audioBuffer->pan = 0.5f; audioBuffer->callback = NULL; + audioBuffer->userData = NULL; audioBuffer->processor = NULL; audioBuffer->playing = false; @@ -684,6 +688,17 @@ void ResumeAudioBuffer(AudioBuffer *buffer) } } +// Turn looping on or off +void SetAudioBufferLooping(AudioBuffer* buffer, bool loop) +{ + if (buffer != NULL) + { + ma_mutex_lock(&AUDIO.System.lock); + buffer->looping = loop; + ma_mutex_unlock(&AUDIO.System.lock); + } +} + // Set volume for an audio buffer void SetAudioBufferVolume(AudioBuffer *buffer, float volume) { @@ -2186,6 +2201,12 @@ void StopAudioStream(AudioStream stream) StopAudioBuffer(stream.buffer); } +// Turn looping on or off +void SetAudioStreamLooping(AudioStream stream, bool loop) +{ + SetAudioBufferLooping(stream.buffer, loop); +} + // Set volume for audio stream (1.0 is max level) void SetAudioStreamVolume(AudioStream stream, float volume) { @@ -2211,12 +2232,13 @@ void SetAudioStreamBufferSizeDefault(int size) } // Audio thread callback to request new data -void SetAudioStreamCallback(AudioStream stream, AudioCallback callback) +void SetAudioStreamCallback(AudioStream stream, AudioCallback callback, void* userData) { if (stream.buffer != NULL) { ma_mutex_lock(&AUDIO.System.lock); stream.buffer->callback = callback; + stream.buffer->userData = userData; ma_mutex_unlock(&AUDIO.System.lock); } } @@ -2224,12 +2246,13 @@ void SetAudioStreamCallback(AudioStream stream, AudioCallback callback) // Add processor to audio stream. Contrary to buffers, the order of processors is important // The new processor must be added at the end. As there aren't supposed to be a lot of processors attached to // a given stream, we iterate through the list to find the end. That way we don't need a pointer to the last element -void AttachAudioStreamProcessor(AudioStream stream, AudioCallback process) +void AttachAudioStreamProcessor(AudioStream stream, AudioCallback process, void* userData) { ma_mutex_lock(&AUDIO.System.lock); rAudioProcessor *processor = (rAudioProcessor *)RL_CALLOC(1, sizeof(rAudioProcessor)); processor->process = process; + processor->userData = userData; rAudioProcessor *last = stream.buffer->processor; @@ -2277,12 +2300,13 @@ void DetachAudioStreamProcessor(AudioStream stream, AudioCallback process) // Add processor to audio pipeline. Order of processors is important // Works the same way as {Attach,Detach}AudioStreamProcessor() functions, except // these two work on the already mixed output just before sending it to the sound hardware -void AttachAudioMixedProcessor(AudioCallback process) +void AttachAudioMixedProcessor(AudioCallback process, void* userData) { ma_mutex_lock(&AUDIO.System.lock); rAudioProcessor *processor = (rAudioProcessor *)RL_CALLOC(1, sizeof(rAudioProcessor)); processor->process = process; + processor->userData = userData; rAudioProcessor *last = AUDIO.mixedProcessor; @@ -2344,7 +2368,7 @@ static ma_uint32 ReadAudioBufferFramesInInternalFormat(AudioBuffer *audioBuffer, // Using audio buffer callback if (audioBuffer->callback) { - audioBuffer->callback(framesOut, frameCount); + frameCount = audioBuffer->callback(framesOut, frameCount, audioBuffer->userData); audioBuffer->framesProcessed += frameCount; return frameCount; @@ -2527,7 +2551,7 @@ static void OnSendAudioDataToDevice(ma_device *pDevice, void *pFramesOut, const rAudioProcessor *processor = audioBuffer->processor; while (processor) { - processor->process(framesIn, framesJustRead); + processor->process(framesIn, framesJustRead, processor->userData); processor = processor->next; } @@ -2571,7 +2595,7 @@ static void OnSendAudioDataToDevice(ma_device *pDevice, void *pFramesOut, const rAudioProcessor *processor = AUDIO.mixedProcessor; while (processor) { - processor->process(pFramesOut, frameCount); + processor->process(pFramesOut, frameCount, processor->userData); processor = processor->next; } diff --git a/src/raylib.h b/src/raylib.h index 686e83c9c..8b6146502 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -1602,7 +1602,7 @@ RLAPI RayCollision GetRayCollisionQuad(Ray ray, Vector3 p1, Vector3 p2, Vector3 //------------------------------------------------------------------------------------ // Audio Loading and Playing Functions (Module: audio) //------------------------------------------------------------------------------------ -typedef void (*AudioCallback)(void *bufferData, unsigned int frames); +typedef unsigned int (*AudioCallback)(void *bufferData, unsigned int frames, void* userData); // Audio device management functions RLAPI void InitAudioDevice(void); // Initialize audio device and context @@ -1670,16 +1670,17 @@ RLAPI void PauseAudioStream(AudioStream stream); // Pause a RLAPI void ResumeAudioStream(AudioStream stream); // Resume audio stream RLAPI bool IsAudioStreamPlaying(AudioStream stream); // Check if audio stream is playing RLAPI void StopAudioStream(AudioStream stream); // Stop audio stream +RLAPI void SetAudioStreamLooping(AudioStream stream, bool loop); // Turn looping on or off RLAPI void SetAudioStreamVolume(AudioStream stream, float volume); // Set volume for audio stream (1.0 is max level) RLAPI void SetAudioStreamPitch(AudioStream stream, float pitch); // Set pitch for audio stream (1.0 is base level) RLAPI void SetAudioStreamPan(AudioStream stream, float pan); // Set pan for audio stream (0.5 is centered) RLAPI void SetAudioStreamBufferSizeDefault(int size); // Default size for new audio streams -RLAPI void SetAudioStreamCallback(AudioStream stream, AudioCallback callback); // Audio thread callback to request new data +RLAPI void SetAudioStreamCallback(AudioStream stream, AudioCallback callback, void* userData); // Audio thread callback to request new data -RLAPI void AttachAudioStreamProcessor(AudioStream stream, AudioCallback processor); // Attach audio stream processor to stream, receives the samples as 'float' +RLAPI void AttachAudioStreamProcessor(AudioStream stream, AudioCallback processor, void* userData); // Attach audio stream processor to stream, receives the samples as 'float' RLAPI void DetachAudioStreamProcessor(AudioStream stream, AudioCallback processor); // Detach audio stream processor from stream -RLAPI void AttachAudioMixedProcessor(AudioCallback processor); // Attach audio stream processor to the entire audio pipeline, receives the samples as 'float' +RLAPI void AttachAudioMixedProcessor(AudioCallback processor, void* userData); // Attach audio stream processor to the entire audio pipeline, receives the samples as 'float' RLAPI void DetachAudioMixedProcessor(AudioCallback processor); // Detach audio stream processor from the entire audio pipeline #if defined(__cplusplus)