Changeset 914:6d4cb6fa9644 in mediastreamer2

Timestamp:

Mar 17, 2010 10:54:52 AM (3 years ago)

Author:

Simon Morlat <simon.morlat@…>

Branch:

default

Message:

Restart alsa when suspended.

File:

• src/alsa.c (modified) (3 diffs)

src/alsa.c

@@ -311 +311 @@
 }
 
+static void alsa_resume(snd_pcm_t *handle){
+        int err;
+        ms_warning("Maybe suspended, trying resume");
+        if ((err=snd_pcm_resume(handle))!=0){
+                if (err!=EWOULDBLOCK) ms_warning("snd_pcm_resume() failed: %s",snd_strerror(err));
+        }
+}
+
 static int alsa_read(snd_pcm_t *handle,unsigned char *buf,int nsamples)
 {
@@ -321 +329 @@
                         err=snd_pcm_readi(handle,buf,nsamples);
                         if (err<0) ms_warning("alsa_read: snd_pcm_readi() failed:%s.",snd_strerror(err));
+                }else if (err==-ESTRPIPE){
+                        alsa_resume(handle);
                 }else if (err!=-EWOULDBLOCK){
                         ms_warning("alsa_read: snd_pcm_readi() failed:%s.",snd_strerror(err));
@@ -342 +352 @@
                         err=snd_pcm_writei(handle,buf,nsamples);
                         if (err<0) ms_warning("alsa_card_write: Error writing sound buffer (nsamples=%i):%s",nsamples,snd_strerror(err));
+                }else if (err==-ESTRPIPE){
+                        alsa_resume(handle);
                 }else if (err!=-EWOULDBLOCK){
                         ms_warning("alsa_card_write: snd_pcm_writei() failed:%s.",snd_strerror(err));