AuroraMiddleware/AuroraOpenALSoft
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prevent some ICC warnings

Browse Source
This commit is contained in:
Chris Robinson 2007-12-06 22:49:23 -08:00
parent d608df5b22
commit 18f05cc1d1
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Alc/ALu.c
View File

@ -407,8 +407,8 @@ ALvoid aluMixData(ALCcontext *ALContext,ALvoid *buffer,ALsizei size,ALenum forma
if(buffer) if(buffer)
{ {
//Figure output format variables //Figure output format variables
BlockAlign = aluChannelsFromFormat(format) * BlockAlign = aluChannelsFromFormat(format);
aluBytesFromFormat(format); BlockAlign *= aluBytesFromFormat(format);
size /= BlockAlign; size /= BlockAlign;
while(size > 0) while(size > 0)

8
Alc/alsa.c
View File

@ -751,6 +751,8 @@ LOAD_FUNC(snd_card_next);
dev = -1; dev = -1;
while (idx < MAX_ALL_DEVICES) { while (idx < MAX_ALL_DEVICES) {
const char *cname, *dname;
if (psnd_ctl_pcm_next_device(handle, &dev)<0) if (psnd_ctl_pcm_next_device(handle, &dev)<0)
AL_PRINT("snd_ctl_pcm_next_device failed\n"); AL_PRINT("snd_ctl_pcm_next_device failed\n");
if (dev < 0) 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)); AL_PRINT("control digital audio info (%i): %s\n", card, psnd_strerror(err));
continue; 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]", snprintf(name, sizeof(name), "ALSA Software on %s [%s]",
psnd_ctl_card_info_get_name(info), cname, dname);
psnd_pcm_info_get_name(pcminfo));
allDevNameMap[idx].name = AppendAllDeviceList(name); allDevNameMap[idx].name = AppendAllDeviceList(name);
allDevNameMap[idx].card = card; allDevNameMap[idx].card = card;
allDevNameMap[idx].dev = dev; allDevNameMap[idx].dev = dev;