# HG changeset patch
# User alex
# Date 1104170106 0
# Node ID 92a2b97ccc4f8f4d19cf487af47f8fc8c2faf642
# Parent  7ea3c86f32950cb70fa2c7410244a4fc232fedb2
removing AFMT_ dependancy

diff -r 7ea3c86f3295 -r 92a2b97ccc4f libmpdemux/demux_xmms.c
--- a/libmpdemux/demux_xmms.c	Mon Dec 27 17:49:52 2004 +0000
+++ b/libmpdemux/demux_xmms.c	Mon Dec 27 17:55:06 2004 +0000
@@ -13,7 +13,7 @@
 #include <sys/stat.h>
 
 #include "../m_option.h"
-#include "../libao2/afmt.h"
+#include "../libaf/af_format.h"
 #include "stream.h"
 #include "demuxer.h"
 #include "stheader.h"
@@ -68,32 +68,32 @@
 static int disk_open(AFormat fmt, int rate, int nch) {
     switch (fmt) {
 	case FMT_U8:
-	    xmms_afmt=AFMT_U8;
+	    xmms_afmt=AF_FORMAT_U8;
 	    break;
 	case FMT_S8:
-	    xmms_afmt=AFMT_S8;
+	    xmms_afmt=AF_FORMAT_S8;
 	    break;
 	case FMT_U16_LE:
-	    xmms_afmt=AFMT_U16_LE;
+	    xmms_afmt=AF_FORMAT_U16_LE;
 	    break;
 	case FMT_U16_NE:
 #if WORDS_BIGENDIAN
-	    xmms_afmt=AFMT_U16_BE;
+	    xmms_afmt=AF_FORMAT_U16_BE;
 #else
-	    xmms_afmt=AFMT_U16_LE;
+	    xmms_afmt=AF_FORMAT_U16_LE;
 #endif
 	    break;
 	case FMT_U16_BE:
-	    xmms_afmt=AFMT_U16_BE;
+	    xmms_afmt=AF_FORMAT_U16_BE;
 	    break;
 	case FMT_S16_NE:
-	    xmms_afmt=AFMT_S16_NE;
+	    xmms_afmt=AF_FORMAT_S16_NE;
 	    break;
 	case FMT_S16_LE:
-	    xmms_afmt=AFMT_S16_LE;
+	    xmms_afmt=AF_FORMAT_S16_LE;
 	    break;
 	case FMT_S16_BE:
-	    xmms_afmt=AFMT_S16_BE;
+	    xmms_afmt=AF_FORMAT_S16_BE;
 	    break;
     }
     xmms_samplerate=rate;
@@ -251,10 +251,10 @@
   }
   sh_audio->sample_format= xmms_afmt;
   switch (xmms_afmt) {
-    case AFMT_S16_LE:
-    case AFMT_S16_BE:
-    case AFMT_U16_LE:
-    case AFMT_U16_BE:
+    case AF_FORMAT_S16_LE:
+    case AF_FORMAT_S16_BE:
+    case AF_FORMAT_U16_LE:
+    case AF_FORMAT_U16_BE:
         sh_audio->samplesize = 2;
 	break;
     default: