commit 8bb414d2aac3b41695b528f21b7e285ebdb225e4
author malc <av1474@comtv.ru> Wed Apr 21 15:40:23 2010 +0400
committer malc <av1474@comtv.ru> Wed Apr 21 15:40:23 2010 +0400
tree 2b5343d1aeb03d7af96da616964d7ba0332d8b93
parent 470e63633f371611c1a03ffe4229eadccfbe013b

audio/alsa: Avoid snd_pcm_format_t vs audfmt_e mixup

Spotted by Serge Ziryukin and based on his patch, thanks.

Signed-off-by: malc <av1474@comtv.ru>

audio/alsaaudio.c

diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c
index 88344ff..f0171f9 100644
--- a/audio/alsaaudio.c
+++ b/audio/alsaaudio.c
@@ -411,10 +411,11 @@
 }
 
 static void alsa_dump_info (struct alsa_params_req *req,
-                            struct alsa_params_obt *obt)
+                            struct alsa_params_obt *obt,
+                            snd_pcm_format_t obtfmt)
 {
     dolog ("parameter | requested value | obtained value\n");
-    dolog ("format    |      %10d |     %10d\n", req->fmt, obt->fmt);
+    dolog ("format    |      %10d |     %10d\n", req->fmt, obtfmt);
     dolog ("channels  |      %10d |     %10d\n",
            req->nchannels, obt->nchannels);
     dolog ("frequency |      %10d |     %10d\n", req->freq, obt->freq);
@@ -666,15 +667,15 @@
     *handlep = handle;
 
     if (conf.verbose &&
-        (obt->fmt != req->fmt ||
+        (obtfmt != req->fmt ||
          obt->nchannels != req->nchannels ||
          obt->freq != req->freq)) {
         dolog ("Audio parameters for %s\n", typ);
-        alsa_dump_info (req, obt);
+        alsa_dump_info (req, obt, obtfmt);
     }
 
 #ifdef DEBUG
-    alsa_dump_info (req, obt);
+    alsa_dump_info (req, obt, obtfmt);
 #endif
     return 0;