From: Richard Kettlewell <rjk@greenend.org.uk>
Date: Sun, 8 Jun 2008 12:44:34 +0000 (+0100)
Subject: Don't use deprecated ALSA calls (since they generate warnings, which
X-Git-Tag: 4.0~5
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/cf7ca906b7d1bd1e3eda7dc1288dca508d3947c1

Don't use deprecated ALSA calls (since they generate warnings, which
breaks with -Werror).  Stupid ALSA.
---

diff --git a/server/speaker-alsa.c b/server/speaker-alsa.c
index 41e53b2..5f9a82f 100644
--- a/server/speaker-alsa.c
+++ b/server/speaker-alsa.c
@@ -60,14 +60,18 @@ static void log_params(snd_pcm_hw_params_t *hwparams,
     info("sw silence_size=%lu", (unsigned long)f);
     snd_pcm_sw_params_get_silence_threshold(swparams, &f);
     info("sw silence_threshold=%lu", (unsigned long)f);
+#if HAVE_SND_PCM_SW_PARAMS_GET_SLEEP_MIN
     snd_pcm_sw_params_get_sleep_min(swparams, &u);
     info("sw sleep_min=%lu", (unsigned long)u);
+#endif
     snd_pcm_sw_params_get_start_threshold(swparams, &f);
     info("sw start_threshold=%lu", (unsigned long)f);
     snd_pcm_sw_params_get_stop_threshold(swparams, &f);
     info("sw stop_threshold=%lu", (unsigned long)f);
+#if HAVE_SND_PCM_SW_PARAMS_GET_XFER_ALIGN
     snd_pcm_sw_params_get_xfer_align(swparams, &f);
     info("sw xfer_align=%lu", (unsigned long)f);
+#endif
   }
 }