]> git.alsa-project.org Git - alsa-lib.git/commitdiff
Fixed typos
authorJaroslav Kysela <perex@perex.cz>
Thu, 19 Apr 2001 11:15:35 +0000 (11:15 +0000)
committerJaroslav Kysela <perex@perex.cz>
Thu, 19 Apr 2001 11:15:35 +0000 (11:15 +0000)
src/pcm/pcm_surr.c

index 2afa04017825322302390ec7d8ee076fc1ba2803..fa9f1cd7284d99e25618a6b8cc2dcecb3647bc53 100644 (file)
@@ -168,12 +168,7 @@ static snd_pcm_sframes_t snd_pcm_surround_writei(snd_pcm_t *pcm, const void *buf
 {
        snd_pcm_surround_t *surr = pcm->private_data;
        if (surr->pcms == 1)
-               return snd_pcm_writei(pcm, buffer, size);
-       if (pcm->running_areas == NULL) {
-               int err;
-               if ((err = snd_pcm_mmap(pcm)) < 0)
-                       return err;
-       }
+               return snd_pcm_writei(surr->pcm[0], buffer, size);
        return snd_pcm_mmap_writei(pcm, buffer, size);
 }
 
@@ -198,9 +193,8 @@ static snd_pcm_sframes_t snd_pcm_surround_readi(snd_pcm_t *pcm, void *buffer, sn
 {
        snd_pcm_surround_t *surr = pcm->private_data;
        if (surr->pcms == 1)
-               return snd_pcm_readi(pcm, buffer, size);
-       /* TODO: convert two or three stereo streams to one interleaved stream */
-       return -EIO;
+               return snd_pcm_readi(surr->pcm[0], buffer, size);
+       return snd_pcm_mmap_readi(pcm, buffer, size);
 }
 
 static snd_pcm_sframes_t snd_pcm_surround_readn(snd_pcm_t *pcm, void **bufs, snd_pcm_uframes_t size)