diff options
author | Chris Robinson <[email protected]> | 2007-12-06 22:49:23 -0800 |
---|---|---|
committer | Chris Robinson <[email protected]> | 2007-12-06 22:49:23 -0800 |
commit | 18f05cc1d129c572c05e1c7633f43f9125a6cd0b (patch) | |
tree | e1a7e34d40f5b257e91bb82eba11d098eb486151 /Alc | |
parent | d608df5b22f74af0c73d69bf6049bc0d729d8c5a (diff) |
Prevent some ICC warnings
Diffstat (limited to 'Alc')
-rw-r--r-- | Alc/ALu.c | 4 | ||||
-rw-r--r-- | Alc/alsa.c | 8 |
2 files changed, 8 insertions, 4 deletions
@@ -407,8 +407,8 @@ ALvoid aluMixData(ALCcontext *ALContext,ALvoid *buffer,ALsizei size,ALenum forma if(buffer) { //Figure output format variables - BlockAlign = aluChannelsFromFormat(format) * - aluBytesFromFormat(format); + BlockAlign = aluChannelsFromFormat(format); + BlockAlign *= aluBytesFromFormat(format); size /= BlockAlign; while(size > 0) @@ -751,6 +751,8 @@ LOAD_FUNC(snd_card_next); dev = -1; while (idx < MAX_ALL_DEVICES) { + const char *cname, *dname; + if (psnd_ctl_pcm_next_device(handle, &dev)<0) AL_PRINT("snd_ctl_pcm_next_device failed\n"); if (dev < 0) @@ -763,9 +765,11 @@ LOAD_FUNC(snd_card_next); AL_PRINT("control digital audio info (%i): %s\n", card, psnd_strerror(err)); continue; } + + cname = psnd_ctl_card_info_get_name(info); + dname = psnd_pcm_info_get_name(pcminfo); snprintf(name, sizeof(name), "ALSA Software on %s [%s]", - psnd_ctl_card_info_get_name(info), - psnd_pcm_info_get_name(pcminfo)); + cname, dname); allDevNameMap[idx].name = AppendAllDeviceList(name); allDevNameMap[idx].card = card; allDevNameMap[idx].dev = dev; |