ericonr/sndio
1
0
Fork 0
mirror of https://github.com/ericonr/sndio.git synced 2024-02-18 04:45:21 -06:00
Code Issues Projects Releases Wiki Activity

Tweak spacing of sio_oss.c to look more like other files.

Browse Source
This commit is contained in:
Alexandre Ratchov 2016-11-03 08:09:11 +01:00
parent d396d690d1
commit e867d773fa
1 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
libsndio/sio_oss.c
View File

@ -45,16 +45,17 @@ struct sio_oss_fmt {
unsigned int le; unsigned int le;
unsigned int msb; unsigned int msb;
}; };
static struct sio_oss_fmt formats[] = { static struct sio_oss_fmt formats[] = {
/* See http://manuals.opensound.com/developer/formats.html. /* See http://manuals.opensound.com/developer/formats.html.
* AFMT_{S8,U16}_* are marked as obsolete so are missing here. * AFMT_{S8,U16}_* are marked as obsolete so are missing here.
*/ */
/* le+msb not important */ /* le+msb not important */
{ AFMT_U8, 8, 1, 0, 0, 0 }, { AFMT_U8, 8, 1, 0, 0, 0 },
{ AFMT_U8, 8, 1, 0, 1, 0 }, { AFMT_U8, 8, 1, 0, 1, 0 },
{ AFMT_U8, 8, 1, 0, 0, 1 }, { AFMT_U8, 8, 1, 0, 0, 1 },
{ AFMT_U8, 8, 1, 0, 1, 1 }, { AFMT_U8, 8, 1, 0, 1, 1 },
/* msb not important */ /* msb not important */
{ AFMT_S16_BE, 16, 2, 1, 0, 0 }, { AFMT_S16_BE, 16, 2, 1, 0, 0 },
@ -338,22 +339,22 @@ sio_oss_stop(struct sio_hdl *sh)
{ {
struct sio_oss_hdl *hdl = (struct sio_oss_hdl*)sh; struct sio_oss_hdl *hdl = (struct sio_oss_hdl*)sh;
if (ioctl(hdl->fd, SNDCTL_DSP_SYNC, NULL) < 0) { if (ioctl(hdl->fd, SNDCTL_DSP_SYNC, NULL) < 0) {
DPERROR("sio_oss_stop: SYNC"); DPERROR("sio_oss_stop: SYNC");
hdl->sio.eof = 1; hdl->sio.eof = 1;
return 0; return 0;
} }
if (ioctl(hdl->fd, SNDCTL_DSP_HALT, NULL) < 0) { if (ioctl(hdl->fd, SNDCTL_DSP_HALT, NULL) < 0) {
DPERROR("sio_oss_stop: HALT"); DPERROR("sio_oss_stop: HALT");
hdl->sio.eof = 1; hdl->sio.eof = 1;
return 0; return 0;
} }
/* Reset device parameters. When we do not do this, resuming /* Reset device parameters. When we do not do this, resuming
* playback/recording will trigger poll with revents=POLLIN * playback/recording will trigger poll with revents=POLLIN
* too often, which leads to sndiod using 100 % CPU. * too often, which leads to sndiod using 100 % CPU.
*/ */
return sio_oss_setpar(sh, &hdl->sio.par); return sio_oss_setpar(sh, &hdl->sio.par);
} }
static int static int
@ -365,10 +366,10 @@ sio_oss_setpar(struct sio_hdl *sh, struct sio_par *par)
hdl->fmt = AFMT_S16_LE; hdl->fmt = AFMT_S16_LE;
for (i = 0; i < sizeof(formats)/sizeof(formats[0]); i++) { for (i = 0; i < sizeof(formats)/sizeof(formats[0]); i++) {
if (formats[i].bits == par->bits if (formats[i].bits == par->bits &&
&& formats[i].le == par->le formats[i].le == par->le &&
&& formats[i].sig == par->sig formats[i].sig == par->sig &&
&& formats[i].msb == par->msb) { formats[i].msb == par->msb) {
hdl->fmt = formats[i].fmt; hdl->fmt = formats[i].fmt;
break; break;
} }