[pulseaudio-commits] r1587 - /branches/lennart/src/modules/module-alsa-source.c

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Tue Aug  7 12:48:29 2007
New Revision: 1587

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=3D1587&root=3Dpulseaudio&vi=
ew=3Drev
Log:
reinitialize sw params after resume

Modified:
    branches/lennart/src/modules/module-alsa-source.c

Modified: branches/lennart/src/modules/module-alsa-source.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/modules/mo=
dule-alsa-source.c?rev=3D1587&root=3Dpulseaudio&r1=3D1586&r2=3D1587&view=3D=
diff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/lennart/src/modules/module-alsa-source.c (original)
+++ branches/lennart/src/modules/module-alsa-source.c Tue Aug  7 12:48:29 2=
007
@@ -264,7 +264,7 @@
         pa_log_warn("Resume failed, couldn't get original access mode.");
         goto fail;
     }
-
+    =

     if (!pa_sample_spec_equal(&ss, &u->source->sample_spec)) {
         pa_log_warn("Resume failed, couldn't restore original sample setti=
ngs.");
         goto fail;
@@ -275,6 +275,11 @@
         goto fail;
     }
 =

+    if ((err =3D pa_alsa_set_sw_params(u->pcm_handle)) < 0) {
+        pa_log("Failed to set software parameters: %s", snd_strerror(err));
+        goto fail;
+    }
+    =

     snd_pcm_start(u->pcm_handle);
     =

     /* FIXME: We need to reload the volume somehow */
@@ -565,8 +570,6 @@
                     if (t < 0) {
                         pa_memblock_unref(chunk.memblock);
 =

-                        pa_assert(t !=3D -EPIPE);
-                        =

                         if ((t =3D snd_pcm_recover(u->pcm_handle, t, 1)) =
=3D=3D 0)
                             continue;
                         =