changeset 3188:68bb898b8ae0

alsa-ng: Some fixes
author William Pitcock <nenolod@atheme.org>
date Fri, 19 Jun 2009 09:10:13 -0500
parents 360e92f3211d
children ab6c7ebcd301
files src/alsa-ng/alsa-core.c src/alsa-ng/alsa-util.c
diffstat 2 files changed, 7 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- 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)
     {
--- 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},