ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
malc 2010-04-21 15:40:23 +04:00
parent 470e63633f
commit 8bb414d2aa
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
audio/alsaaudio.c
View File

@ -411,10 +411,11 @@ static int alsa_to_audfmt (snd_pcm_format_t alsafmt, audfmt_e *fmt,
} }
static void alsa_dump_info (struct alsa_params_req *req, 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 ("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", dolog ("channels | %10d | %10d\n",
req->nchannels, obt->nchannels); req->nchannels, obt->nchannels);
dolog ("frequency | %10d | %10d\n", req->freq, obt->freq); dolog ("frequency | %10d | %10d\n", req->freq, obt->freq);
@ -666,15 +667,15 @@ static int alsa_open (int in, struct alsa_params_req *req,
*handlep = handle; *handlep = handle;
if (conf.verbose && if (conf.verbose &&
(obt->fmt != req->fmt || (obtfmt != req->fmt ||
obt->nchannels != req->nchannels || obt->nchannels != req->nchannels ||
obt->freq != req->freq)) { obt->freq != req->freq)) {
dolog ("Audio parameters for %s\n", typ); dolog ("Audio parameters for %s\n", typ);
alsa_dump_info (req, obt); alsa_dump_info (req, obt, obtfmt);
} }
#ifdef DEBUG #ifdef DEBUG
alsa_dump_info (req, obt); alsa_dump_info (req, obt, obtfmt);
#endif #endif
return 0; return 0;