#include <fcntl.h>
#include <unistd.h>
#include <errno.h>
+#include <time.h>
#include "mem.h"
#include "log.h"
NULL
};
-/** @brief Actually play sound via OSS */
-static size_t oss_play(void *buffer, size_t samples) {
- const size_t bytes = samples * uaudio_sample_size;
- int rc = write(oss_fd, buffer, bytes);
- if(rc < 0)
- fatal(errno, "error writing to sound device");
- return rc / uaudio_sample_size;
-}
-
/** @brief Open the OSS sound device */
static void oss_open(void) {
const char *device = uaudio_get("device", NULL);
#endif
}
-static void oss_activate(void) {
- oss_open();
- uaudio_thread_activate();
+/** @brief Close the OSS sound device */
+static void oss_close(void) {
+ if(oss_fd != -1) {
+ close(oss_fd);
+ oss_fd = -1;
+ }
}
-static void oss_deactivate(void) {
- uaudio_thread_deactivate();
- close(oss_fd);
- oss_fd = -1;
+/** @brief Actually play sound via OSS */
+static size_t oss_play(void *buffer, size_t samples, unsigned flags) {
+ /* cf uaudio-alsa.c:alsa-play() */
+ if(flags & UAUDIO_PAUSED) {
+ if(flags & UAUDIO_PAUSE)
+ oss_close();
+ if(samples > 64)
+ samples /= 2;
+ const uint64_t ns = ((uint64_t)samples * 1000000000
+ / (uaudio_rate * uaudio_channels));
+ struct timespec ts[1];
+ ts->tv_sec = ns / 1000000000;
+ ts->tv_nsec = ns % 1000000000;
+ while(nanosleep(ts, ts) < 0 && errno == EINTR)
+ ;
+ return samples;
+ }
+ if(flags & UAUDIO_RESUME)
+ oss_open();
+ const size_t bytes = samples * uaudio_sample_size;
+ int rc = write(oss_fd, buffer, bytes);
+ if(rc < 0)
+ fatal(errno, "error writing to sound device");
+ return rc / uaudio_sample_size;
}
-
+
static void oss_start(uaudio_callback *callback,
void *userdata) {
if(uaudio_channels != 1 && uaudio_channels != 2)
/* Very specific buffer size requirements here apparently */
uaudio_thread_start(callback, userdata, oss_play,
4608 / uaudio_sample_size,
- 4608 / uaudio_sample_size);
+ 4608 / uaudio_sample_size,
+ 0);
#else
/* We could SNDCTL_DSP_GETBLKSIZE but only when the device is already open,
* which is kind of inconvenient. We go with 1-4Kbyte for now. */
uaudio_thread_start(callback, userdata, oss_play,
32 / uaudio_sample_size,
- 4096 / uaudio_sample_size);
+ 4096 / uaudio_sample_size,
+ 0);
#endif
}
static void oss_stop(void) {
uaudio_thread_stop();
+ oss_close(); /* might not have been paused */
}
/** @brief Channel names */
static const char *oss_channels[] = SOUND_DEVICE_NAMES;
static int oss_mixer_find_channel(const char *channel) {
- if(!channel[strspn(c, "0123456789")])
+ if(!channel[strspn(channel, "0123456789")])
return atoi(channel);
else {
- for(int n = 0; n < sizeof oss_channels / sizeof *oss_channels; ++n)
- if(!strcmp(oss_channels[n], channels))
+ for(unsigned n = 0; n < sizeof oss_channels / sizeof *oss_channels; ++n)
+ if(!strcmp(oss_channels[n], channel))
return n;
return -1;
}
int r;
*left = *right = 0;
- if(ioctl(oss_mixer_fd, SOUND_MIXER_READ(ch), &r) < 0)
+ if(ioctl(oss_mixer_fd, SOUND_MIXER_READ(oss_mixer_channel), &r) < 0)
error(errno, "error getting volume");
else {
*left = r & 0xff;
static void oss_set_volume(int *left, int *right) {
int r = (*left & 0xff) + (*right & 0xff) * 256;
- if(ioctl(fd, SOUND_MIXER_WRITE(ch), &r) == -1)
+ if(ioctl(oss_mixer_fd, SOUND_MIXER_WRITE(oss_mixer_channel), &r) == -1)
error(errno, "error setting volume");
- else if(ioctl(oss_mixer_fd, SOUND_MIXER_READ(ch), &r) < 0)
+ else if(ioctl(oss_mixer_fd, SOUND_MIXER_READ(oss_mixer_channel), &r) < 0)
error(errno, "error getting volume");
else {
*left = r & 0xff;
.options = oss_options,
.start = oss_start,
.stop = oss_stop,
- .activate = oss_activate,
- .deactivate = oss_deactivate,
+ .activate = uaudio_thread_activate,
+ .deactivate = uaudio_thread_deactivate,
.open_mixer = oss_open_mixer,
.close_mixer = oss_close_mixer,
.get_volume = oss_get_volume,