YangWX/crossdesk
1
0
Fork 0
mirror of https://github.com/kunkundi/crossdesk.git synced 2026-03-22 07:37:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

[fix] fix Linux audio fallback when audio devices are unavaliable

Browse Source
This commit is contained in:
dijunkun
2026-03-20 15:14:45 +08:00
parent f0f8f27f4c
commit 2bbddbca6b
1 changed files with 38 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/gui/render.cpp
View File

@@ -7,6 +7,7 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#endif #endif
#include <cstdlib>
#include <cstring> #include <cstring>
#include <filesystem> #include <filesystem>
#include <fstream> #include <fstream>
@@ -874,11 +875,38 @@ int Render::AudioDeviceInit() {
desired_out.format = SDL_AUDIO_S16; desired_out.format = SDL_AUDIO_S16;
desired_out.channels = 1; desired_out.channels = 1;
output_stream_ = SDL_OpenAudioDeviceStream(SDL_AUDIO_DEVICE_DEFAULT_PLAYBACK, auto open_stream = [&]() -> bool {
&desired_out, nullptr, nullptr); output_stream_ = SDL_OpenAudioDeviceStream(
if (!output_stream_) { SDL_AUDIO_DEVICE_DEFAULT_PLAYBACK, &desired_out, nullptr, nullptr);
return output_stream_ != nullptr;
};
if (!open_stream()) {
#if defined(__linux__) && !defined(__APPLE__)
LOG_WARN(
"Failed to open output stream with driver [{}]: {}",
getenv("SDL_AUDIODRIVER") ? getenv("SDL_AUDIODRIVER") : "(default)",
SDL_GetError());
setenv("SDL_AUDIODRIVER", "dummy", 1);
SDL_QuitSubSystem(SDL_INIT_AUDIO);
if (!SDL_InitSubSystem(SDL_INIT_AUDIO)) {
LOG_ERROR("Failed to reinitialize SDL audio with dummy driver: {}",
SDL_GetError());
return -1;
}
if (!open_stream()) {
LOG_ERROR("Failed to open output stream with dummy driver: {}",
SDL_GetError());
return -1;
}
LOG_WARN("Audio output disabled, using SDL dummy audio driver");
#else
LOG_ERROR("Failed to open output stream: {}", SDL_GetError()); LOG_ERROR("Failed to open output stream: {}", SDL_GetError());
return -1; return -1;
#endif
} }
SDL_ResumeAudioDevice(SDL_GetAudioStreamDevice(output_stream_)); SDL_ResumeAudioDevice(SDL_GetAudioStreamDevice(output_stream_));
@@ -1533,6 +1561,13 @@ void Render::InitializeSettings() {
} }
void Render::InitializeSDL() { void Render::InitializeSDL() {
#if defined(__linux__) && !defined(__APPLE__)
if (!getenv("SDL_AUDIODRIVER")) {
// Prefer PulseAudio first on Linux to avoid hard ALSA plugin dependency.
setenv("SDL_AUDIODRIVER", "pulseaudio", 0);
}
#endif
if (!SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO)) { if (!SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO)) {
LOG_ERROR("Error: {}", SDL_GetError()); LOG_ERROR("Error: {}", SDL_GetError());
return; return;