From 5f64fe734ebf309a73973126f5cf62322e09ee89 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Fri, 29 Jul 2011 11:04:13 +0100 Subject: pcm: Factor out pcm_start() from pcm_read() When starting the stream we're doing the same as a start() --- pcm.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'pcm.c') diff --git a/pcm.c b/pcm.c index 9e198ad..d253433 100644 --- a/pcm.c +++ b/pcm.c @@ -401,11 +401,7 @@ int pcm_read(struct pcm *pcm, void *data, unsigned int count) for (;;) { if (!pcm->running) { - if (ioctl(pcm->fd, SNDRV_PCM_IOCTL_PREPARE)) - return oops(pcm, errno, "cannot prepare channel"); - if (ioctl(pcm->fd, SNDRV_PCM_IOCTL_START)) - return oops(pcm, errno, "cannot start channel"); - pcm->running = 1; + pcm_start(pcm); } if (ioctl(pcm->fd, SNDRV_PCM_IOCTL_READI_FRAMES, &x)) { pcm->running = 0; -- cgit v1.2.3