From 4cc305c37a316ceab491166170b3bd7244c582b2 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 9 Jan 2026 21:31:01 +0200 Subject: [PATCH 66/66] Fix crash when adjusting volume with dummy audio plugin See RM #1890 Signed-off-by: Marko Lindqvist --- client/audio_none.c | 22 ++++++++++++++++++++++ client/audio_sdl.c | 1 + 2 files changed, 23 insertions(+) diff --git a/client/audio_none.c b/client/audio_none.c index 6d81aac2b1..6eda951b08 100644 --- a/client/audio_none.c +++ b/client/audio_none.c @@ -26,6 +26,8 @@ #include "audio_none.h" +static double none_audio_volume; + /**********************************************************************//** Clean up **************************************************************************/ @@ -77,6 +79,22 @@ static void none_audio_resume(void) { } +/**********************************************************************//** + Adjust volume +**************************************************************************/ +static void none_audio_set_volume(double volume) +{ + none_audio_volume = volume; +} + +/**********************************************************************//** + Get the volume. +**************************************************************************/ +static double none_audio_get_volume(void) +{ + return none_audio_volume; +} + /**********************************************************************//** Initialize. **************************************************************************/ @@ -105,5 +123,9 @@ void audio_none_init(void) self.play = none_audio_play; self.pause = none_audio_pause; self.resume = none_audio_resume; + self.set_volume = none_audio_set_volume; + self.get_volume = none_audio_get_volume; audio_add_plugin(&self); + + none_audio_volume = 1.0; } diff --git a/client/audio_sdl.c b/client/audio_sdl.c index c2a3a4535b..31fa9ff885 100644 --- a/client/audio_sdl.c +++ b/client/audio_sdl.c @@ -490,5 +490,6 @@ void audio_sdl_init(void) self.set_volume = sdl_audio_set_volume; self.get_volume = sdl_audio_get_volume; audio_add_plugin(&self); + sdl_audio_volume = 1.0; } -- 2.51.0