/*
* This file is part of DisOrder.
- * Copyright (C) 2009 Richard Kettlewell
+ * Copyright (C) 2009, 2013 Richard Kettlewell
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
switch(rc) {
case -EPIPE:
if((err = snd_pcm_prepare(alsa_pcm)))
- fatal(0, "error calling snd_pcm_prepare: %d", err);
+ disorder_fatal(0, "error calling snd_pcm_prepare: %d", err);
return 0;
case -EAGAIN:
return 0;
SND_PCM_STREAM_PLAYBACK,
0)))
disorder_fatal(0, "error from snd_pcm_open: %d", err);
+ /* Hardware parameters */
snd_pcm_hw_params_t *hwparams;
snd_pcm_hw_params_alloca(&hwparams);
if((err = snd_pcm_hw_params_any(alsa_pcm, hwparams)) < 0)
uaudio_channels, err);
if((err = snd_pcm_hw_params(alsa_pcm, hwparams)) < 0)
disorder_fatal(0, "error calling snd_pcm_hw_params: %d", err);
-
+ /* Software parameters */
+ snd_pcm_sw_params_t *swparams;
+ snd_pcm_sw_params_alloca(&swparams);
+ if((err = snd_pcm_sw_params_current(alsa_pcm, swparams)) < 0)
+ disorder_fatal(-err, "error calling snd_pcm_sw_params_current");
+ /* Bump the start threshold a bit since Pulseaudio sulks with the defaults */
+ if((err = snd_pcm_sw_params_set_start_threshold(alsa_pcm, swparams, 1024)) < 0)
+ disorder_fatal(-err, "error calling snd_pcm_sw_params_set_start_threshold");
+ if((err = snd_pcm_sw_params(alsa_pcm, swparams)) < 0)
+ disorder_fatal(-err, "error calling snd_pcm_sw_params");
}
static void alsa_start(uaudio_callback *callback,
- void *userdata) {
+ void *userdata) {
if(uaudio_channels != 1 && uaudio_channels != 2)
disorder_fatal(0, "asked for %d channels but only support 1 or 2",
uaudio_channels);
snd_mixer_selem_id_t *id;
const char *device = uaudio_get("device", "default");
const char *mixer = uaudio_get("mixer-control", "0");
- const char *channel = uaudio_get("mixer-channel", "PCM");
+ const char *channel = uaudio_get("mixer-channel", "Master");
snd_mixer_selem_id_alloca(&id);
if((err = snd_mixer_open(&alsa_mixer_handle, 0)))
.close_mixer = alsa_close_mixer,
.get_volume = alsa_get_volume,
.set_volume = alsa_set_volume,
- .configure = alsa_configure
+ .configure = alsa_configure,
+ .flags = UAUDIO_API_CLIENT | UAUDIO_API_SERVER,
};
#endif