# HG changeset patch
# User giacomo
# Date 1174335508 25200
# Node ID c7daa70ffe7efa65018e5e7a63c7981b00d22c69
# Parent  aa044d71838f865ff52741e64c51aadcf27b9226
[svn] alsa output plugin: use snd_pcm_wait in place of raw polls to handle device readyness; this allows to use alsa plugins such as jackplug; requires testing

diff -r aa044d71838f -r c7daa70ffe7e ChangeLog
--- a/ChangeLog	Mon Mar 19 13:15:52 2007 -0700
+++ b/ChangeLog	Mon Mar 19 13:18:28 2007 -0700
@@ -1,3 +1,46 @@
+2007-03-19 20:15:52 +0000  Tony Vroon <chainsaw@gentoo.org>
+  revision [1856]
+  Goodbye ffmpeg, welcome back WMA.
+  trunk/configure.ac                   |   14 
+  trunk/src/wma/Makefile               |   18 
+  trunk/src/wma/libffwma/Makefile      |   23 
+  trunk/src/wma/libffwma/allcodecs.c   |   34 
+  trunk/src/wma/libffwma/allformats.c  |   30 
+  trunk/src/wma/libffwma/asf.c         | 1008 +++++++++++++++
+  trunk/src/wma/libffwma/asfheader.h   |  261 +++
+  trunk/src/wma/libffwma/avcodec.h     | 1806 +++++++++++++++++++++++++++
+  trunk/src/wma/libffwma/avformat.h    |  632 +++++++++
+  trunk/src/wma/libffwma/avi.h         |   43 
+  trunk/src/wma/libffwma/avio.c        |  184 ++
+  trunk/src/wma/libffwma/avio.h        |  175 ++
+  trunk/src/wma/libffwma/aviobuf.c     |  397 ++++++
+  trunk/src/wma/libffwma/bswap.h       |  173 ++
+  trunk/src/wma/libffwma/common.c      |  311 ++++
+  trunk/src/wma/libffwma/common.h      |  941 ++++++++++++++
+  trunk/src/wma/libffwma/cutils.c      |  239 +++
+  trunk/src/wma/libffwma/cutils.h      |   14 
+  trunk/src/wma/libffwma/dsputil.c     |  892 +++++++++++++
+  trunk/src/wma/libffwma/dsputil.h     |  512 +++++++
+  trunk/src/wma/libffwma/fft.c         |  441 ++++++
+  trunk/src/wma/libffwma/file.c        |   91 +
+  trunk/src/wma/libffwma/futils.c      | 2310 +++++++++++++++++++++++++++++++++++
+  trunk/src/wma/libffwma/mdct.c        |  175 ++
+  trunk/src/wma/libffwma/mem.c         |   78 +
+  trunk/src/wma/libffwma/os_support.c  |   44 
+  trunk/src/wma/libffwma/os_support.h  |   33 
+  trunk/src/wma/libffwma/parser.c      |  135 ++
+  trunk/src/wma/libffwma/simple_idct.c |  585 ++++++++
+  trunk/src/wma/libffwma/simple_idct.h |   36 
+  trunk/src/wma/libffwma/uri.c         |  858 +++++++++++++
+  trunk/src/wma/libffwma/uri.h         |   92 +
+  trunk/src/wma/libffwma/utils.c       |  635 +++++++++
+  trunk/src/wma/libffwma/utils.h       |    8 
+  trunk/src/wma/libffwma/wmadata.h     | 1412 +++++++++++++++++++++
+  trunk/src/wma/libffwma/wmadec.c      | 1337 ++++++++++++++++++++
+  trunk/src/wma/wma.c                  |  478 +++++++
+  37 files changed, 16448 insertions(+), 7 deletions(-)
+
+
 2007-03-19 03:24:01 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
   revision [1854]
   - kill bad .depend file
diff -r aa044d71838f -r c7daa70ffe7e src/alsa/audio.c
--- a/src/alsa/audio.c	Mon Mar 19 13:15:52 2007 -0700
+++ b/src/alsa/audio.c	Mon Mar 19 13:18:28 2007 -0700
@@ -824,15 +824,12 @@
 static void *alsa_loop(void *arg)
 {
 	int npfds = snd_pcm_poll_descriptors_count(alsa_pcm);
-	struct pollfd *pfds;
-	unsigned short *revents;
 
 	g_mutex_lock(alsa_mutex);
 
 	if (npfds <= 0)
 		goto _error;
-	pfds = alloca(sizeof(*pfds) * npfds);
-	revents = alloca(sizeof(*revents) * npfds);
+
 	while (going && alsa_pcm)
 	{
 		if (get_thread_buffer_filled() > prebuffer_size)
@@ -840,23 +837,9 @@
 		if (!paused && !prebuffer &&
 		    get_thread_buffer_filled() > hw_period_size_in)
 		{
-			snd_pcm_poll_descriptors(alsa_pcm, pfds, npfds);
-			if (poll(pfds, npfds, 10) > 0)
+			if (snd_pcm_wait(alsa_pcm, 10) > 0)
 			{
-				/*
-				 * need to check revents.  poll() with
-				 * dmix returns a postive value even
-				 * if no data is available
-				 */
-				int i;
-				snd_pcm_poll_descriptors_revents(alsa_pcm, pfds,
-								 npfds, revents);
-				for (i = 0; i < npfds; i++)
-					if (revents[i] & POLLOUT)
-					{
-						alsa_write_out_thread_data();
-						break;
-					}
+				alsa_write_out_thread_data();
 			}
 		}
 		else