From: Jaroslav Kysela <perex@perex.cz>
Date: Fri, 7 Nov 2025 16:04:53 +0000 (+0100)
Subject: alsamixer: add support for new log handler (alsa-lib 1.2.15)
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=55017b0222eb27cb05faa69ac3e3584f5183d1c0;p=alsa-utils.git

alsamixer: add support for new log handler (alsa-lib 1.2.15)

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---

diff --git a/alsamixer/mainloop.c b/alsamixer/mainloop.c
index 7ca785b..3cb51b4 100644
--- a/alsamixer/mainloop.c
+++ b/alsamixer/mainloop.c
@@ -34,6 +34,7 @@
 
 static WINDOW *curses_initialized;
 
+#if SND_LIB_VER(1, 2, 15) < SND_LIB_VERSION
 static void black_hole_error_handler(const char *file ATTRIBUTE_UNUSED,
 				     int line ATTRIBUTE_UNUSED,
 				     const char *function ATTRIBUTE_UNUSED,
@@ -41,6 +42,18 @@ static void black_hole_error_handler(const char *file ATTRIBUTE_UNUSED,
 				     const char *fmt ATTRIBUTE_UNUSED, ...)
 {
 }
+#else
+static void black_hole_log_handler(int prio ATTRIBUTE_UNUSED,
+				   int interface ATTRIBUTE_UNUSED,
+				   const char *file ATTRIBUTE_UNUSED,
+				   int line ATTRIBUTE_UNUSED,
+				   const char *function ATTRIBUTE_UNUSED,
+				   int errcode ATTRIBUTE_UNUSED,
+				   const char *fmt ATTRIBUTE_UNUSED,
+				   va_list arg ATTRIBUTE_UNUSED)
+{
+}
+#endif
 
 void initialize_curses(bool use_color, bool use_mouse)
 {
@@ -55,7 +68,11 @@ void initialize_curses(bool use_color, bool use_mouse)
 	if (use_mouse)
 		mousemask(ALL_MOUSE_EVENTS, NULL);
 
+#if SND_LIB_VER(1, 2, 15) < SND_LIB_VERSION
 	snd_lib_error_set_handler(black_hole_error_handler);
+#else
+	snd_lib_log_set_handler(black_hole_log_handler);
+#endif
 }
 
 void app_shutdown(void)