diff options
Diffstat (limited to 'pd/src/s_audio_oss.c')
| -rw-r--r-- | pd/src/s_audio_oss.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/pd/src/s_audio_oss.c b/pd/src/s_audio_oss.c index 21927f68..965d5b6c 100644 --- a/pd/src/s_audio_oss.c +++ b/pd/src/s_audio_oss.c @@ -138,18 +138,13 @@ int oss_reset(int fd) { #endif void oss_configure(t_oss_dev *dev, int srate, int dac, int skipblocksize) -{ /* IOhannes */ +{ int orig, param, nblk, fd = dev->d_fd, wantformat; int nchannels = dev->d_nchannels; int advwas = sys_schedadvance; audio_buf_info ainfo; - /* IOhannes : - * pd is very likely to crash if different formats are used on - multiple soundcards - */ - /* set resolution - first try 4 byte samples */ if (oss_32bit && (ioctl(fd,SNDCTL_DSP_GETFMTS,¶m) >= 0) && (param & AFMT_S32_BLOCKED)) @@ -249,7 +244,7 @@ void oss_configure(t_oss_dev *dev, int srate, int dac, int skipblocksize) } static int oss_setchannels(int fd, int wantchannels, char *devname) -{ /* IOhannes */ +{ int param = wantchannels; while (param > 1) @@ -269,7 +264,7 @@ static int oss_setchannels(int fd, int wantchannels, char *devname) int oss_open_audio(int nindev, int *indev, int nchin, int *chin, int noutdev, int *outdev, int nchout, int *chout, int rate) -{ /* IOhannes */ +{ int capabilities = 0; int inchannels = 0, outchannels = 0; char devname[20]; |