williamp/osmocom-analog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Common code: Fix sound card reset

Browse Source
This commit is contained in:
Andreas Eversberg
2016-08-07 17:22:24 +02:00
parent 7f786fc00a
commit 362b1cbb61
1 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/common/sound_alsa.c
View File

@@ -105,6 +105,29 @@ error:
return rc; return rc;
} }
static int sound_prepare(sound_t *sound)
{
int rc;
int16_t buff[2];
rc = snd_pcm_prepare(sound->phandle);
if (rc < 0) {
PDEBUG(DSOUND, DEBUG_ERROR, "cannot prepare audio interface for use (%s)\n", snd_strerror(rc));
return rc;
}
rc = snd_pcm_prepare(sound->chandle);
if (rc < 0) {
PDEBUG(DSOUND, DEBUG_ERROR, "cannot prepare audio interface for use (%s)\n", snd_strerror(rc));
return rc;
}
/* trigger capturing */
snd_pcm_readi(sound->chandle, buff, 1);
return 0;
}
void *sound_open(const char *device, int samplerate) void *sound_open(const char *device, int samplerate)
{ {
sound_t *sound; sound_t *sound;
@@ -142,21 +165,9 @@ void *sound_open(const char *device, int samplerate)
} }
PDEBUG(DSOUND, DEBUG_DEBUG, "Capture with %d channels.\n", sound->cchannels); PDEBUG(DSOUND, DEBUG_DEBUG, "Capture with %d channels.\n", sound->cchannels);
rc = snd_pcm_prepare(sound->phandle); rc = sound_prepare(sound);
if (rc < 0) { if (rc < 0)
PDEBUG(DSOUND, DEBUG_ERROR, "cannot prepare audio interface for use (%s)\n", snd_strerror(rc));
goto error; goto error;
}
rc = snd_pcm_prepare(sound->chandle);
if (rc < 0) {
PDEBUG(DSOUND, DEBUG_ERROR, "cannot prepare audio interface for use (%s)\n", snd_strerror(rc));
goto error;
}
/* trigger capturing */
int16_t buff[2];
snd_pcm_readi(sound->chandle, buff, 1);
return sound; return sound;
@@ -197,7 +208,7 @@ int sound_write(void *inst, int16_t *samples_left, int16_t *samples_right, int n
if (rc < 0) { if (rc < 0) {
PDEBUG(DSOUND, DEBUG_ERROR, "failed to write audio to interface (%s)\n", snd_strerror(rc)); PDEBUG(DSOUND, DEBUG_ERROR, "failed to write audio to interface (%s)\n", snd_strerror(rc));
if (rc == -EPIPE) if (rc == -EPIPE)
snd_pcm_prepare(sound->phandle); sound_prepare(sound);
return rc; return rc;
} }
@@ -236,7 +247,7 @@ int sound_read(void *inst, int16_t *samples_left, int16_t *samples_right, int nu
PDEBUG(DSOUND, DEBUG_ERROR, "failed to read audio from interface (%s)\n", snd_strerror(rc)); PDEBUG(DSOUND, DEBUG_ERROR, "failed to read audio from interface (%s)\n", snd_strerror(rc));
/* recover read */ /* recover read */
if (rc == -EPIPE) if (rc == -EPIPE)
snd_pcm_prepare(sound->chandle); sound_prepare(sound);
return rc; return rc;
} }
@@ -268,7 +279,7 @@ int sound_get_inbuffer(void *inst)
else else
PDEBUG(DSOUND, DEBUG_ERROR, "failed to get delay from interface (%s)\n", snd_strerror(rc)); PDEBUG(DSOUND, DEBUG_ERROR, "failed to get delay from interface (%s)\n", snd_strerror(rc));
if (rc == -EPIPE) if (rc == -EPIPE)
snd_pcm_prepare(sound->phandle); sound_prepare(sound);
return rc; return rc;
} }