Merge branch 'master' of...

Merge branch 'master' of git+ssh://repos-sflphone-git@git.sflphone.org/var/repos/sflphone/git/sflphone

sflphone-common/src/audio/alsa/alsalayer.cpp

@@ -376,6 +376,35 @@ void AlsaLayer::preparePlaybackStream (void)
     }
 }
 
+/*
+void AlsaLayer::recoverPlaybackStream(int error)
+{
+
+    int err;
+
+    if (is_playback_open() && is_playback_running()) {
+	_debug("AlsaLayer:: recover playback stream\n");
+	if((err = snd_pcm_recover(_PlaybackHandle, error, 0)) < 0 )
+	    _debug("Error recovering the device: %s\n", snd_strerror(err));
+    }
+}
+*/
+
+/*
+void AlsaLayer::recoverPlaybackStream(int error)
+{
+
+    int err;
+
+    if (is_capture_open() && is_capture_running()) {
+	_debug("AlsaLayer:: recover capture stream\n");
+	if((err = snd_pcm_recover(_PlaybackHandle, error, 0)) < 0 )
+	    _debug("Error recovering the device: %s\n", snd_strerror(err));
+    }
+}
+*/
+
+
 bool AlsaLayer::alsa_set_params (snd_pcm_t *pcm_handle, int type, int rate)
 {
 

sflphone-common/src/audio/pulseaudio/pulselayer.cpp

@@ -57,7 +57,7 @@ static void stream_moved_callback(pa_stream *s UNUSED, void *userdata UNUSED)
 static void playback_underflow_callback (pa_stream* s,  void* userdata UNUSED)
 {
     _debug ("PulseLayer::Buffer Underflow\n");
-    // pa_stream_trigger (s, NULL, NULL);
+    pa_stream_trigger (s, NULL, NULL);
 
 }