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

Add support for initing specific device

Browse Source
This commit is contained in:
Cherry 2026-01-12 18:58:05 +03:00
parent c259e30b4f
commit 8f33ca4bb9
14 changed files with 107 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1,6 +1,8 @@
cmake_minimum_required(VERSION 3.5)
project(raylib)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
# Avoid excessive expansion of variables in conditionals. In particular, if
# "PLATFORM" is "DRM" then:
#

0
currentBuffer
View File

3
examples/audio/audio_mixed_processor.c
View File

@ -55,7 +55,8 @@ int main(void)
InitWindow(screenWidth, screenHeight, "raylib [audio] example - processing mixed output");
InitAudioDevice(); // Initialize audio device
InitAudioContext();
InitAudioDevice(0); // Initialize audio device
AttachAudioMixedProcessor(ProcessAudio);

3
examples/audio/audio_module_playing.c
View File

@ -37,7 +37,8 @@ int main(void)
InitWindow(screenWidth, screenHeight, "raylib [audio] example - module playing (streaming)");
InitAudioDevice(); // Initialize audio device
InitAudioContext();
InitAudioDevice(0); // Initialize audio device
Color colors[14] = { ORANGE, RED, GOLD, LIME, BLUE, VIOLET, BROWN, LIGHTGRAY, PINK,
YELLOW, GREEN, SKYBLUE, PURPLE, BEIGE };

12
examples/audio/audio_music_stream.c
View File

@ -12,6 +12,11 @@
********************************************************************************************/
#include "raylib.h"
#include <stdio.h>
void AudioDevicesQuery(int index, char* deviceName, bool isDefault) {
printf("index: %d / deviceName: %s / isDefault: %d\n", index, deviceName, isDefault);
}
//------------------------------------------------------------------------------------
// Program main entry point
@ -25,7 +30,11 @@ int main(void)
InitWindow(screenWidth, screenHeight, "raylib [audio] example - music playing (streaming)");
InitAudioDevice(); // Initialize audio device
InitAudioContext();
QueryAudioDevices(AudioDevicesQuery);
InitAudioDevice(0); // Initialize audio device
Music music = LoadMusicStream("resources/country.mp3");
@ -90,6 +99,7 @@ int main(void)
UnloadMusicStream(music); // Unload music stream buffers from RAM
CloseAudioDevice(); // Close audio device (music streaming is automatically stopped)
CloseAudioDevice();
CloseWindow(); // Close window and OpenGL context
//--------------------------------------------------------------------------------------

3
examples/audio/audio_raw_stream.c
View File

@ -62,7 +62,8 @@ int main(void)
InitWindow(screenWidth, screenHeight, "raylib [audio] example - raw audio streaming");
InitAudioDevice(); // Initialize audio device
InitAudioContext();
InitAudioDevice(0); // Initialize audio device
SetAudioStreamBufferSizeDefault(MAX_SAMPLES_PER_UPDATE);

3
examples/audio/audio_sound_loading.c
View File

@ -25,7 +25,8 @@ int main(void)
InitWindow(screenWidth, screenHeight, "raylib [audio] example - sound loading and playing");
InitAudioDevice(); // Initialize audio device
InitAudioContext();
InitAudioDevice(0); // Initialize audio device
Sound fxWav = LoadSound("resources/sound.wav"); // Load WAV audio file
Sound fxOgg = LoadSound("resources/target.ogg"); // Load OGG audio file

3
examples/audio/audio_sound_multi.c
View File

@ -29,7 +29,8 @@ int main(void)
InitWindow(screenWidth, screenHeight, "raylib [audio] example - playing sound multiple times");
InitAudioDevice(); // Initialize audio device
InitAudioContext();
InitAudioDevice(0); // Initialize audio device
// load the sound list
soundArray[0] = LoadSound("resources/sound.wav"); // Load WAV audio file into the first slot as the 'source' sound

3
examples/audio/audio_stream_effects.c
View File

@ -39,7 +39,8 @@ int main(void)
InitWindow(screenWidth, screenHeight, "raylib [audio] example - stream effects");
InitAudioDevice(); // Initialize audio device
InitAudioContext();
InitAudioDevice(0); // Initialize audio device
Music music = LoadMusicStream("resources/country.mp3");

3
examples/others/embedded_files_loading.c
View File

@ -30,7 +30,8 @@ int main(void)
InitWindow(screenWidth, screenHeight, "raylib [others] example - embedded files loading");
InitAudioDevice(); // Initialize audio device
InitAudioContext();
InitAudioDevice(0); // Initialize audio device
// Loaded in CPU memory (RAM) from header file (audio_data.h)
// Same as: Wave wave = LoadWave("sound.wav");

3
examples/textures/textures_sprite_button.c
View File

@ -27,7 +27,8 @@ int main(void)
InitWindow(screenWidth, screenHeight, "raylib [textures] example - sprite button");
InitAudioDevice(); // Initialize audio device
InitAudioContext();
InitAudioDevice(0); // Initialize audio device
Sound fxButton = LoadSound("resources/buttonfx.wav"); // Load button sound
Texture2D button = LoadTexture("resources/button.png"); // Load button texture

3
examples/textures/textures_sprite_explosion.c
View File

@ -28,7 +28,8 @@ int main(void)
InitWindow(screenWidth, screenHeight, "raylib [textures] example - sprite explosion");
InitAudioDevice();
InitAudioContext();
InitAudioDevice(0);
// Load explosion sound
Sound fxBoom = LoadSound("resources/boom.wav");

77
src/raudio.c
View File

@ -381,6 +381,7 @@ typedef struct AudioData {
ma_context context; // miniaudio context data
ma_device device; // miniaudio device
ma_mutex lock; // miniaudio mutex lock
bool isCtxReady;
bool isReady; // Check if audio device is ready
size_t pcmBufferSize; // Pre-allocated buffer size
void *pcmBuffer; // Pre-allocated buffer to read audio data from file/memory
@ -455,8 +456,9 @@ void UntrackAudioBuffer(AudioBuffer *buffer);
//----------------------------------------------------------------------------------
// Module Functions Definition - Audio Device initialization and Closing
//----------------------------------------------------------------------------------
// Initialize audio device
void InitAudioDevice(void)
void InitAudioContext(void)
{
// Init audio context
ma_context_config ctxConfig = ma_context_config_init();
@ -469,10 +471,67 @@ void InitAudioDevice(void)
return;
}
AUDIO.System.isCtxReady = true;
}
void QueryAudioDevices(void(*callback)(int, char*, bool)) {
ma_device_info* pPlaybackInfos;
ma_uint32 playbackCount;
ma_device_info* pCaptureInfos;
ma_uint32 captureCount;
if (ma_context_get_devices(&AUDIO.System.context, &pPlaybackInfos, &playbackCount, &pCaptureInfos, &captureCount) != MA_SUCCESS)
{
TRACELOG(LOG_WARNING, "AUDIO: Failed to query playback devices");
return;
}
for (ma_uint32 i = 0; i < playbackCount; i += 1) {
callback(i, pPlaybackInfos[i].name, pPlaybackInfos[i].isDefault);
}
}
// Initialize audio device
void InitAudioDevice(char* deviceName)
{
if (!AUDIO.System.isCtxReady) {
TRACELOG(LOG_WARNING, "AUDIO: Failed to initialize playback device because context is not ready yet");
return;
}
ma_device_info* pPlaybackInfos;
ma_uint32 playbackCount;
ma_device_info* pCaptureInfos;
ma_uint32 captureCount;
ma_device_id* pDeviceId = NULL;
if (deviceName == NULL)
{
TRACELOG(LOG_WARNING, "AUDIO: No playback device provided, falling back to default");
}
else
{
if (ma_context_get_devices(&AUDIO.System.context, &pPlaybackInfos, &playbackCount, &pCaptureInfos, &captureCount) != MA_SUCCESS)
{
TRACELOG(LOG_WARNING, "AUDIO: Failed to query playback devices, falling back to default");
}
else
{
for (ma_uint32 i = 0; i < playbackCount; i += 1)
{
if (strcmp(deviceName, pPlaybackInfos[i].name) == 0)
{
pDeviceId = &pPlaybackInfos[i].id;
break;
}
}
}
}
// Init audio device
// NOTE: Using the default device. Format is floating point because it simplifies mixing
ma_device_config config = ma_device_config_init(ma_device_type_playback);
config.playback.pDeviceID = NULL; // NULL for the default playback AUDIO.System.device
config.playback.pDeviceID = pDeviceId; // NULL for the default playback AUDIO.System.device
config.playback.format = AUDIO_DEVICE_FORMAT;
config.playback.channels = AUDIO_DEVICE_CHANNELS;
config.capture.pDeviceID = NULL; // NULL for the default capture AUDIO.System.device
@ -482,7 +541,7 @@ void InitAudioDevice(void)
config.dataCallback = OnSendAudioDataToDevice;
config.pUserData = NULL;
result = ma_device_init(&AUDIO.System.context, &config, &AUDIO.System.device);
ma_result result = ma_device_init(&AUDIO.System.context, &config, &AUDIO.System.device);
if (result != MA_SUCCESS)
{
TRACELOG(LOG_WARNING, "AUDIO: Failed to initialize playback device");
@ -528,7 +587,6 @@ void CloseAudioDevice(void)
{
ma_mutex_uninit(&AUDIO.System.lock);
ma_device_uninit(&AUDIO.System.device);
ma_context_uninit(&AUDIO.System.context);
AUDIO.System.isReady = false;
RL_FREE(AUDIO.System.pcmBuffer);
@ -540,6 +598,17 @@ void CloseAudioDevice(void)
else TRACELOG(LOG_WARNING, "AUDIO: Device could not be closed, not currently initialized");
}
void CloseAudioContext(void) {
if (AUDIO.System.isCtxReady)
{
ma_context_uninit(&AUDIO.System.context);
AUDIO.System.isCtxReady = false;
TRACELOG(LOG_INFO, "AUDIO: Context closed successfully");
}
else TRACELOG(LOG_WARNING, "AUDIO: Context could not be closed, not currently initialized");
}
// Check if device has been initialized successfully
bool IsAudioDeviceReady(void)
{

4
src/raylib.h
View File

@ -1624,7 +1624,9 @@ RLAPI RayCollision GetRayCollisionQuad(Ray ray, Vector3 p1, Vector3 p2, Vector3
typedef void (*AudioCallback)(void *bufferData, unsigned int frames);
// Audio device management functions
RLAPI void InitAudioDevice(void); // Initialize audio device and context
RLAPI void InitAudioContext(void);
RLAPI void QueryAudioDevices(void(*callback)(int, char*, bool));
RLAPI void InitAudioDevice(char* deviceName); // Initialize audio device
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)