#include "quakedef.h"
-static const int tryrates[] = {44100, 22051, 11025, 8000};
+static const int tryrates[] = {44100, 22050, 11025, 8000};
static int audio_fd = -1;
static qboolean snd_inited = false;
qboolean SNDDMA_Init (void)
{
unsigned int i;
- const char *snddev = _PATH_SOUND;
+ const char *snddev;
audio_info_t info;
memset ((void*)shm, 0, sizeof (*shm));
// Open the audio device
+#ifdef _PATH_SOUND
+ snddev = _PATH_SOUND;
+#else
+ snddev = "/dev/sound";
+#endif
audio_fd = open (snddev, O_WRONLY | O_NDELAY | O_NONBLOCK);
if (audio_fd < 0)
{
// Look for an appropriate sound format
// TODO: we should also test mono/stereo and bits
// TODO: support "-sndspeed", "-sndbits", "-sndmono" and "-sndstereo"
- shm->channels = 2;
- shm->samplebits = 16;
+ shm->format.channels = 2;
+ shm->format.width = 2;
for (i = 0; i < sizeof (tryrates) / sizeof (tryrates[0]); i++)
{
- shm->speed = tryrates[i];
+ shm->format.speed = tryrates[i];
AUDIO_INITINFO (&info);
- info.play.sample_rate = shm->speed;
- info.play.channels = shm->channels;
- info.play.precision = shm->samplebits;
+ info.play.sample_rate = shm->format.speed;
+ info.play.channels = shm->format.channels;
+ info.play.precision = shm->format.width * 8;
// We only handle sound cards of the same endianess than the CPU
#if BYTE_ORDER == BIG_ENDIAN
info.play.encoding = AUDIO_ENCODING_SLINEAR_BE;
(info.play.channels == 2) ? "stereo" : "mono",
info.play.sample_rate);
- shm->samples = sizeof (dma_buffer) / (shm->samplebits / 8);
+ shm->samples = sizeof (dma_buffer) / shm->format.width;
shm->samplepos = 0;
shm->buffer = dma_buffer;
return 0;
}
- return ((info.play.samples * shm->channels) % shm->samples);
+ return ((info.play.samples * shm->format.channels) % shm->samples);
}
void SNDDMA_Shutdown (void)
if (paintedtime < wbufp)
wbufp = 0; // reset
- bsize = shm->channels * (shm->samplebits / 8);
+ bsize = shm->format.channels * shm->format.width;
bytes = (paintedtime - wbufp) * bsize;
if (!bytes)