# HG changeset patch
# User nenolod
# Date 1155274831 25200
# Node ID 3af18d169044f443fa8d0cece1295bd910d57a06
# Parent  0a927f814a12e80a72dd321bf8c28c631e2dc982
[svn] - Plugins/Container/xspf/xspf.c: xspf cleanups
- configure.ac, audacious/main.h: If XSPF is available, use XSPF instead of m3u for storing the playlist.

diff -r 0a927f814a12 -r 3af18d169044 ChangeLog
--- a/ChangeLog	Thu Aug 10 22:26:50 2006 -0700
+++ b/ChangeLog	Thu Aug 10 22:40:31 2006 -0700
@@ -1,3 +1,12 @@
+2006-08-11 05:26:50 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [2050]
+  - experimental XSPF support
+  
+
+  Changes:        Modified:
+  +18 -9          trunk/configure.ac  
+
+
 2006-08-11 04:00:59 +0000  William Pitcock <nenolod@nenolod.net>
   revision [2048]
   - add missing $(CONTAINER_PLUGINS).
diff -r 0a927f814a12 -r 3af18d169044 Plugins/Container/xspf/xspf.c
--- a/Plugins/Container/xspf/xspf.c	Thu Aug 10 22:26:50 2006 -0700
+++ b/Plugins/Container/xspf/xspf.c	Thu Aug 10 22:40:31 2006 -0700
@@ -158,9 +158,9 @@
 
 	for (i = 0; i < n->nodeNr; i++)
 	{
-		char *uri = (char *)XML_GET_CONTENT(n->nodeTab[i]->children);
+		char *uri = XML_GET_CONTENT(n->nodeTab[i]->children);
+		++pos;
 		playlist_ins(uri, pos);
-		++pos;
 		g_free(uri);
 	}
 
diff -r 0a927f814a12 -r 3af18d169044 audacious/main.h
--- a/audacious/main.h	Thu Aug 10 22:26:50 2006 -0700
+++ b/audacious/main.h	Thu Aug 10 22:40:31 2006 -0700
@@ -33,7 +33,11 @@
 #define BMP_SKIN_THUMB_DIR_BASENAME   ".thumbs"
 #define BMP_ACCEL_BASENAME            "accels"
 #define BMP_CONFIG_BASENAME           "config"
-#define BMP_PLAYLIST_BASENAME         "playlist.m3u"
+#ifndef HAVE_XSPF_PLAYLIST
+# define BMP_PLAYLIST_BASENAME         "playlist.m3u"
+#else
+# define BMP_PLAYLIST_BASENAME         "playlist.xspf"
+#endif
 #define BMP_LOG_BASENAME              "log"
 
 #define PLAYER_HEIGHT \
diff -r 0a927f814a12 -r 3af18d169044 configure.ac
--- a/configure.ac	Thu Aug 10 22:26:50 2006 -0700
+++ b/configure.ac	Thu Aug 10 22:40:31 2006 -0700
@@ -943,6 +943,7 @@
 
 if test "$have_xspf" = "yes"; then
 	CONTAINER_PLUGINS="$CONTAINER_PLUGINS xspf"
+	AC_DEFINE(HAVE_XSPF_PLAYLIST, 1, [Define if XSPF playlists are available.])
 fi
 
 dnl *** End of all plugin checks ***