RaySollium99/libpicofe
1
0
Fork 0
mirror of https://github.com/RaySollium99/libpicofe.git synced 2025-09-05 06:47:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

alsa: some stop handling

Browse source
This commit is contained in:
notaz 2013-09-01 18:37:30 +03:00
parent 9089665ca1
commit 9028744c19
1 changed files with 30 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

45
linux/sndout_alsa.c
View file

@ -15,10 +15,13 @@
#include "sndout_alsa.h" #include "sndout_alsa.h"
#define PFX "sndout_alsa: "
static snd_pcm_t *handle; static snd_pcm_t *handle;
static snd_pcm_uframes_t buffer_size, period_size; static snd_pcm_uframes_t buffer_size, period_size;
static unsigned int channels;
static void *silent_period; static void *silent_period;
static unsigned int channels;
static int failure_counter;
int sndout_alsa_init(void) int sndout_alsa_init(void)
{ {
@ -55,15 +58,14 @@ int sndout_alsa_start(int rate_, int stereo)
ret |= snd_pcm_hw_params_set_period_size_near(handle, hwparams, &period_size, NULL); ret |= snd_pcm_hw_params_set_period_size_near(handle, hwparams, &period_size, NULL);
if (ret != 0) { if (ret != 0) {
fprintf(stderr, "sndout_alsa: failed to set hwparams\n"); fprintf(stderr, PFX "failed to set hwparams\n");
return -1; goto fail;
} }
ret = snd_pcm_hw_params(handle, hwparams); ret = snd_pcm_hw_params(handle, hwparams);
if (ret != 0) { if (ret != 0) {
fprintf(stderr, "sndout_alsa: failed to apply hwparams: %d\n", fprintf(stderr, PFX "failed to apply hwparams: %d\n", ret);
ret); goto fail;
return -1;
} }
snd_pcm_hw_params_get_buffer_size(hwparams, &buffer_size); snd_pcm_hw_params_get_buffer_size(hwparams, &buffer_size);
@ -74,21 +76,34 @@ int sndout_alsa_start(int rate_, int stereo)
if (silent_period != NULL) if (silent_period != NULL)
memset(silent_period, 0, period_size * 2 * channels); memset(silent_period, 0, period_size * 2 * channels);
ret = snd_pcm_prepare(handle); ret = snd_pcm_prepare(handle);
ret |= snd_pcm_start(handle);
if (ret != 0) { if (ret != 0) {
fprintf(stderr, "sndout_alsa: failed to start pcm: %d\n", fprintf(stderr, PFX "snd_pcm_prepare failed: %d\n", ret);
ret); goto fail;
return -1;
} }
ret = snd_pcm_start(handle);
if (ret != 0) {
fprintf(stderr, PFX "snd_pcm_start failed: %d\n", ret);
goto fail;
}
failure_counter = 0;
return 0; return 0;
fail:
// to flush out redirected logs
fflush(stdout);
fflush(stderr);
return -1;
} }
void sndout_alsa_stop(void) void sndout_alsa_stop(void)
{ {
// nothing? int ret = snd_pcm_drop(handle);
if (ret != 0)
fprintf(stderr, PFX "snd_pcm_drop failed: %d\n", ret);
} }
void sndout_alsa_wait(void) void sndout_alsa_wait(void)
@ -121,8 +136,8 @@ int sndout_alsa_write_nb(const void *samples, int len)
ret = snd_pcm_writei(handle, samples, len); ret = snd_pcm_writei(handle, samples, len);
if (ret < 0) { if (ret < 0) {
ret = snd_pcm_recover(handle, ret, 1); ret = snd_pcm_recover(handle, ret, 1);
if (ret != 0) if (ret != 0 && failure_counter++ < 5)
fprintf(stderr, "sndout_alsa snd_pcm_recover: %d\n", ret); fprintf(stderr, PFX "snd_pcm_recover: %d\n", ret);
if (silent_period) if (silent_period)
snd_pcm_writei(handle, silent_period, period_size); snd_pcm_writei(handle, silent_period, period_size);