summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorhkc <[email protected]>2023-02-20 13:13:24 +0300
committerGitHub <[email protected]>2023-02-20 11:13:24 +0100
commitd26a56d4e1d8168912e3670a2ff3122b125fd94c (patch)
treefba13887810974d6b570582998f68f8343387aee /src
parent47dd842e8163d43587c7f6bb91bbf88dbdbb24b1 (diff)
downloadraylib-d26a56d4e1d8168912e3670a2ff3122b125fd94c.tar.gz
raylib-d26a56d4e1d8168912e3670a2ff3122b125fd94c.zip
Added mixed audio processor (#2929)
* Use RL_QUADS/RL_TRIANGLES for single-pixel drawing Addresses problem mentioned in https://github.com/raysan5/raylib/issues/2744#issuecomment-1273568263 (in short: when drawing pixels using DrawPixel{,V} in camera mode, upscaled pixel becomes a line instead of bigger pixel) * [rtextures] Fixed scaling down in ImageTextEx Closes #2755 * Added global audio processor * Renamed struct member to follow naming conventions * Added example for AttachAudioMixedProcessor
Diffstat (limited to 'src')
-rw-r--r--src/raudio.c65
-rw-r--r--src/raylib.h3
2 files changed, 67 insertions, 1 deletions
diff --git a/src/raudio.c b/src/raudio.c
index 443fb924..5f533215 100644
--- a/src/raudio.c
+++ b/src/raudio.c
@@ -372,6 +372,7 @@ typedef struct AudioData {
AudioBuffer *last; // Pointer to last AudioBuffer in the list
int defaultSize; // Default audio buffer size for audio streams
} Buffer;
+ rAudioProcessor *mixedProcessor;
struct {
unsigned int poolCounter; // AudioBuffer pointers pool counter
AudioBuffer *pool[MAX_AUDIO_BUFFER_POOL_CHANNELS]; // Multichannel AudioBuffer pointers pool
@@ -388,7 +389,8 @@ static AudioData AUDIO = { // Global AUDIO context
// After some math, considering a sampleRate of 48000, a buffer refill rate of 1/60 seconds and a
// standard double-buffering system, a 4096 samples buffer has been chosen, it should be enough
// In case of music-stalls, just increase this number
- .Buffer.defaultSize = 0
+ .Buffer.defaultSize = 0,
+ .mixedProcessor = NULL
};
//----------------------------------------------------------------------------------
@@ -2278,6 +2280,60 @@ void DetachAudioStreamProcessor(AudioStream stream, AudioCallback process)
ma_mutex_unlock(&AUDIO.System.lock);
}
+// 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)
+{
+ ma_mutex_lock(&AUDIO.System.lock);
+
+ rAudioProcessor *processor = (rAudioProcessor *)RL_CALLOC(1, sizeof(rAudioProcessor));
+ processor->process = process;
+
+ rAudioProcessor *last = AUDIO.mixedProcessor;
+
+ while (last && last->next)
+ {
+ last = last->next;
+ }
+ if (last)
+ {
+ processor->prev = last;
+ last->next = processor;
+ }
+ else AUDIO.mixedProcessor = processor;
+
+ ma_mutex_unlock(&AUDIO.System.lock);
+}
+
+void DetachAudioMixedProcessor(AudioCallback process)
+{
+ ma_mutex_lock(&AUDIO.System.lock);
+
+ rAudioProcessor *processor = AUDIO.mixedProcessor;
+
+ while (processor)
+ {
+ rAudioProcessor *next = processor->next;
+ rAudioProcessor *prev = processor->prev;
+
+ if (processor->process == process)
+ {
+ if (AUDIO.mixedProcessor == processor) AUDIO.mixedProcessor = next;
+ if (prev) prev->next = next;
+ if (next) next->prev = prev;
+
+ RL_FREE(processor);
+ }
+
+ processor = next;
+ }
+
+ ma_mutex_unlock(&AUDIO.System.lock);
+}
+
+
//----------------------------------------------------------------------------------
// Module specific Functions Definition
//----------------------------------------------------------------------------------
@@ -2519,6 +2575,13 @@ static void OnSendAudioDataToDevice(ma_device *pDevice, void *pFramesOut, const
}
}
+ rAudioProcessor *processor = AUDIO.mixedProcessor;
+ while (processor)
+ {
+ processor->process(pFramesOut, frameCount);
+ processor = processor->next;
+ }
+
ma_mutex_unlock(&AUDIO.System.lock);
}
diff --git a/src/raylib.h b/src/raylib.h
index c1b85abd..73c6d224 100644
--- a/src/raylib.h
+++ b/src/raylib.h
@@ -1580,6 +1580,9 @@ RLAPI void SetAudioStreamCallback(AudioStream stream, AudioCallback callback);
RLAPI void AttachAudioStreamProcessor(AudioStream stream, AudioCallback processor); // Attach audio stream processor to stream
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
+RLAPI void DetachAudioMixedProcessor(AudioCallback processor); // Detach audio stream processor from the entire audio pipeline
+
#if defined(__cplusplus)
}
#endif