MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add rAudioConfig and InitAudioDeviceEx

Browse Source
This commit is contained in:
Manuel 2024-07-13 16:25:56 +02:00
parent 8d5374a443
commit cf62c0deed
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/raudio.c
View File

@ -451,12 +451,18 @@ void SetAudioBufferPan(AudioBuffer *buffer, float pan);
void TrackAudioBuffer(AudioBuffer *buffer);
void UntrackAudioBuffer(AudioBuffer *buffer);
//----------------------------------------------------------------------------------
// Module Functions Definition - Audio Device initialization and Closing
//----------------------------------------------------------------------------------
// Initialize audio device
void InitAudioDevice(void)
void InitAudioDevice(void){
// Values of 0 are default for miniaudio
rAudioConfig defaultConfig = {.sampleRate = 0, .periodSizeInFrames = 0};
InitAudioDeviceEx(defaultConfig);
}
void InitAudioDeviceEx(rAudioConfig rConfig)
{
// Init audio context
ma_context_config ctxConfig = ma_context_config_init();
@ -478,9 +484,10 @@ void InitAudioDevice(void)
config.capture.pDeviceID = NULL; // NULL for the default capture AUDIO.System.device
config.capture.format = ma_format_s16;
config.capture.channels = 1;
config.sampleRate = AUDIO_DEVICE_SAMPLE_RATE;
config.sampleRate = rConfig.sampleRate; // Default: AUDIO_DEVICE_SAMPLE_RATE
config.dataCallback = OnSendAudioDataToDevice;
config.pUserData = NULL;
config.periodSizeInFrames = rConfig.periodSizeInFrames;
result = ma_device_init(&AUDIO.System.context, &config, &AUDIO.System.device);
if (result != MA_SUCCESS)
@ -516,7 +523,8 @@ void InitAudioDevice(void)
TRACELOG(LOG_INFO, " > Format: %s -> %s", ma_get_format_name(AUDIO.System.device.playback.format), ma_get_format_name(AUDIO.System.device.playback.internalFormat));
TRACELOG(LOG_INFO, " > Channels: %d -> %d", AUDIO.System.device.playback.channels, AUDIO.System.device.playback.internalChannels);
TRACELOG(LOG_INFO, " > Sample rate: %d -> %d", AUDIO.System.device.sampleRate, AUDIO.System.device.playback.internalSampleRate);
TRACELOG(LOG_INFO, " > Periods size: %d", AUDIO.System.device.playback.internalPeriodSizeInFrames*AUDIO.System.device.playback.internalPeriods);
TRACELOG(LOG_INFO, " > Period count: %d", AUDIO.System.device.playback.internalPeriods);
TRACELOG(LOG_INFO, " > Periods size: %d * %d = %d", AUDIO.System.device.playback.internalPeriodSizeInFrames, AUDIO.System.device.playback.internalPeriods, AUDIO.System.device.playback.internalPeriodSizeInFrames*AUDIO.System.device.playback.internalPeriods);
AUDIO.System.isReady = true;
}

6
src/raylib.h
View File

@ -452,6 +452,11 @@ typedef struct Wave {
typedef struct rAudioBuffer rAudioBuffer;
typedef struct rAudioProcessor rAudioProcessor;
typedef struct rAudioConfig{
unsigned int sampleRate;
unsigned int periodSizeInFrames;
} rAudioConfig;
// AudioStream, custom audio stream
typedef struct AudioStream {
rAudioBuffer *buffer; // Pointer to internal data used by the audio system
@ -1606,6 +1611,7 @@ typedef void (*AudioCallback)(void *bufferData, unsigned int frames);
// Audio device management functions
RLAPI void InitAudioDevice(void); // Initialize audio device and context
RLAPI void InitAudioDeviceEx(rAudioConfig config); // Initialize audio device and context
RLAPI void CloseAudioDevice(void); // Close the audio device and context
RLAPI bool IsAudioDeviceReady(void); // Check if audio device has been initialized successfully
RLAPI void SetMasterVolume(float volume); // Set master volume (listener)