# HG changeset patch
# User William Pitcock <nenolod@atheme.org>
# Date 1245420613 18000
# Node ID 68bb898b8ae0c8b0cfa860e73aa30a54c31f6f6f
# Parent  360e92f3211da773d89364cac3154e9cd1f57078
alsa-ng: Some fixes

diff -r 360e92f3211d -r 68bb898b8ae0 src/alsa-ng/alsa-core.c
--- a/src/alsa-ng/alsa-core.c	Fri Jun 19 08:38:14 2009 -0500
+++ b/src/alsa-ng/alsa-core.c	Fri Jun 19 09:10:13 2009 -0500
@@ -212,7 +212,7 @@
 static gpointer
 alsaplug_loop(gpointer unused)
 {
-    gchar buf[2048];
+    guchar buf[2048];
 
     while (pcm_going)
     {
diff -r 360e92f3211d -r 68bb898b8ae0 src/alsa-ng/alsa-util.c
--- a/src/alsa-ng/alsa-util.c	Fri Jun 19 08:38:14 2009 -0500
+++ b/src/alsa-ng/alsa-util.c	Fri Jun 19 09:10:13 2009 -0500
@@ -24,20 +24,12 @@
     {FMT_S32_LE, SND_PCM_FORMAT_S32_LE},
     {FMT_S32_BE, SND_PCM_FORMAT_S32_BE},
     {FMT_S32_NE, SND_PCM_FORMAT_S32},
-    {FMT_S24_LE, SND_PCM_FORMAT_S24_3LE},
-    {FMT_S24_BE, SND_PCM_FORMAT_S24_3BE},
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-    {FMT_S24_NE, SND_PCM_FORMAT_S24_3LE},
-#else
-    {FMT_S24_NE, SND_PCM_FORMAT_S24_3BE},
-#endif
-    {FMT_U24_LE, SND_PCM_FORMAT_U24_3LE},
-    {FMT_U24_BE, SND_PCM_FORMAT_U24_3BE},
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-    {FMT_U24_NE, SND_PCM_FORMAT_U24_3LE},
-#else
-    {FMT_U24_NE, SND_PCM_FORMAT_U24_3BE},
-#endif
+    {FMT_S24_LE, SND_PCM_FORMAT_S24_LE},
+    {FMT_S24_BE, SND_PCM_FORMAT_S24_BE},
+    {FMT_S24_NE, SND_PCM_FORMAT_S24},
+    {FMT_U24_LE, SND_PCM_FORMAT_U24_LE},
+    {FMT_U24_BE, SND_PCM_FORMAT_U24_BE},
+    {FMT_U24_NE, SND_PCM_FORMAT_U24},
     {FMT_S16_LE, SND_PCM_FORMAT_S16_LE},
     {FMT_S16_BE, SND_PCM_FORMAT_S16_BE},
     {FMT_S16_NE, SND_PCM_FORMAT_S16},