diff options
author | tinyalsa <simonwilson@google.com> | 2012-02-10 17:58:19 -0800 |
---|---|---|
committer | tinyalsa <simonwilson@google.com> | 2012-02-10 17:58:19 -0800 |
commit | 43625117cf24ac933819a10c2da7681252042d49 (patch) | |
tree | 39ca905961a00e337b0ee6469e16981393f3f87d | |
parent | d88eedb72a6deea7d2751e4b80674607cccebdef (diff) | |
parent | 5f64fe734ebf309a73973126f5cf62322e09ee89 (diff) |
Merge pull request #4 from broonie/pcm
pcm: Factor out pcm_start() from pcm_read()
-rw-r--r-- | pcm.c | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -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; |