[polypaudio-commits] r724 - /trunk/src/modules/alsa-util.c

[svnmailer-noreply at 0pointer.de]

Author: ossman
Date: Sun Apr 16 11:23:27 2006
New Revision: 724

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=724&root=polypaudio&view=rev
Log:
Fix ALSA fd handling to be compatible with blocking deferred events.

Modified:
    trunk/src/modules/alsa-util.c

Modified: trunk/src/modules/alsa-util.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/alsa-util.c?rev=724&root=polypaudio&r1=723&r2=724&view=diff
==============================================================================
--- trunk/src/modules/alsa-util.c (original)
+++ trunk/src/modules/alsa-util.c Sun Apr 16 11:23:27 2006
@@ -89,7 +89,6 @@
     if (err < 0) {
         pa_log_error(__FILE__": Unable to get poll revent: %s",
             snd_strerror(err));
-        a->defer_enable(fdl->defer, 0);
         return;
     }
 
@@ -99,6 +98,8 @@
         else
             snd_mixer_handle_events(fdl->mixer);
     }
+
+    a->defer_enable(fdl->defer, 1);
 }
 
 static void defer_cb(pa_mainloop_api*a, pa_defer_event* e, void *userdata) {
@@ -107,6 +108,8 @@
     struct pollfd *temp;
 
     assert(a && fdl && (fdl->pcm || fdl->mixer));
+
+    a->defer_enable(fdl->defer, 0);
 
     if (fdl->pcm)
         num_fds = snd_pcm_poll_descriptors_count(fdl->pcm);
@@ -133,7 +136,6 @@
     if (err < 0) {
         pa_log_error(__FILE__": Unable to get poll descriptors: %s",
             snd_strerror(err));
-        a->defer_enable(fdl->defer, 0);
         return;
     }