qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-06-01 09:02:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Whitespace

Browse source
This commit is contained in:
Ragnvald Maartmann-Moe IV 2004-01-06 03:24:46 +00:00
parent fbe6c2f631
commit 3d14b29b38
2 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libs/audio/Makefile.am
View file

@ -1,8 +1,8 @@
AUTOMAKE_OPTIONS= foreign AUTOMAKE_OPTIONS= foreign
SUBDIRS=cd targets renderer SUBDIRS= cd targets renderer
AM_CFLAGS= @PREFER_PIC@ AM_CFLAGS= @PREFER_PIC@
INCLUDES=-I$(top_srcdir)/include INCLUDES= -I$(top_srcdir)/include
lib_LTLIBRARIES= @CD_TARGETS@ @SND_TARGETS@ lib_LTLIBRARIES= @CD_TARGETS@ @SND_TARGETS@
EXTRA_LTLIBRARIES= libQFsound.la libQFcd.la EXTRA_LTLIBRARIES= libQFsound.la libQFcd.la

15
libs/audio/targets/snd_oss.c
View file

@ -217,7 +217,8 @@ try_open (int rw)
tmp = 1; tmp = 1;
rc = ioctl (audio_fd, SNDCTL_DSP_STEREO, &tmp); rc = ioctl (audio_fd, SNDCTL_DSP_STEREO, &tmp);
if (rc < 0) { if (rc < 0) {
Sys_Printf ("Could not set %s to stereo=%d: %s\n", snd_dev, shm->channels, strerror (errno)); Sys_Printf ("Could not set %s to stereo=%d: %s\n", snd_dev,
shm->channels, strerror (errno));
close (audio_fd); close (audio_fd);
return 0; return 0;
} }
@ -229,7 +230,8 @@ try_open (int rw)
rc = ioctl (audio_fd, SNDCTL_DSP_SPEED, &shm->speed); rc = ioctl (audio_fd, SNDCTL_DSP_SPEED, &shm->speed);
if (rc < 0) { if (rc < 0) {
Sys_Printf ("Could not set %s speed to %d: %s\n", snd_dev, shm->speed, strerror (errno)); Sys_Printf ("Could not set %s speed to %d: %s\n", snd_dev, shm->speed,
strerror (errno));
close (audio_fd); close (audio_fd);
return 0; return 0;
} }
@ -238,7 +240,8 @@ try_open (int rw)
rc = AFMT_S16_LE; rc = AFMT_S16_LE;
rc = ioctl (audio_fd, SNDCTL_DSP_SETFMT, &rc); rc = ioctl (audio_fd, SNDCTL_DSP_SETFMT, &rc);
if (rc < 0) { if (rc < 0) {
Sys_Printf ("Could not support 16-bit data. Try 8-bit. %s\n", strerror (errno)); Sys_Printf ("Could not support 16-bit data. Try 8-bit. %s\n",
strerror (errno));
close (audio_fd); close (audio_fd);
return 0; return 0;
} }
@ -246,12 +249,14 @@ try_open (int rw)
rc = AFMT_U8; rc = AFMT_U8;
rc = ioctl (audio_fd, SNDCTL_DSP_SETFMT, &rc); rc = ioctl (audio_fd, SNDCTL_DSP_SETFMT, &rc);
if (rc < 0) { if (rc < 0) {
Sys_Printf ("Could not support 8-bit data. %s\n", strerror (errno)); Sys_Printf ("Could not support 8-bit data. %s\n",
strerror (errno));
close (audio_fd); close (audio_fd);
return 0; return 0;
} }
} else { } else {
Sys_Printf ("%d-bit sound not supported. %s", shm->samplebits, strerror (errno)); Sys_Printf ("%d-bit sound not supported. %s", shm->samplebits,
strerror (errno));
close (audio_fd); close (audio_fd);
return 0; return 0;
} }