DeforaOS/Phone
DeforaOS/Phone
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Also set the number of channels

Browse Source
This commit is contained in:
Pierre Pronchery 2013-10-27 20:41:37 +01:00
parent 0858155f23
commit 203e1c3abc
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/oss.c
View File

@ -228,11 +228,13 @@ static int _event_audio_play_chunk_wave(OSS * oss, FILE * fp, RIFFChunk * rc)
#else #else
const char devdsp[] = "/dev/dsp"; const char devdsp[] = "/dev/dsp";
#endif #endif
char const * dev;
const char data[4] = "data"; const char data[4] = "data";
const char fmt[4] = "fmt "; const char fmt[4] = "fmt ";
WaveFormat wf; WaveFormat wf;
int fd = -1; int fd = -1;
int format; int format;
int channels;
uint8_t u8; uint8_t u8;
while(rc->ckSize > 0) while(rc->ckSize > 0)
@ -273,21 +275,22 @@ static int _event_audio_play_chunk_wave(OSS * oss, FILE * fp, RIFFChunk * rc)
switch(wf.wFormatTag) switch(wf.wFormatTag)
{ {
case 0x01: case 0x01:
if((fd = open(devdsp, O_WRONLY)) < 0) dev = devdsp;
return -oss->helper->error(NULL,
devdsp, 1);
format = AFMT_U8; format = AFMT_U8;
if(ioctl(fd, SNDCTL_DSP_SETFMT, &format)
< 0)
{
close(fd);
return -oss->helper->error(NULL,
devdsp, 1);
}
break; break;
default: default:
return -1; return -1;
} }
channels = wf.wChannels;
if((fd = open(dev, O_WRONLY)) < 0)
return -oss->helper->error(NULL, dev, 1);
if(ioctl(fd, SNDCTL_DSP_SETFMT, &format) < 0
|| ioctl(fd, SNDCTL_DSP_CHANNELS,
&channels) < 0)
{
close(fd);
return -oss->helper->error(NULL, dev, 1);
}
} }
else if(strncmp(rc2.ckID, data, sizeof(data)) == 0) else if(strncmp(rc2.ckID, data, sizeof(data)) == 0)
{ {