# HG changeset patch
# User nenolod
# Date 1155284063 25200
# Node ID 4023a295db39cecaa483844164e177ed4fc90872
# Parent  3af18d169044f443fa8d0cece1295bd910d57a06
[svn] - wma: use posix_memalign() instead of memalign() in some more spots
- xspf: return if filename is NULL

diff -r 3af18d169044 -r 4023a295db39 ChangeLog
--- a/ChangeLog	Thu Aug 10 22:40:31 2006 -0700
+++ b/ChangeLog	Fri Aug 11 01:14:23 2006 -0700
@@ -1,3 +1,15 @@
+2006-08-11 05:40:31 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [2052]
+  - 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.
+  
+
+  Changes:        Modified:
+  +2 -2           trunk/Plugins/Container/xspf/xspf.c  
+  +5 -1           trunk/audacious/main.h  
+  +1 -0           trunk/configure.ac  
+
+
 2006-08-11 05:26:50 +0000  William Pitcock <nenolod@nenolod.net>
   revision [2050]
   - experimental XSPF support
diff -r 3af18d169044 -r 4023a295db39 Plugins/Container/xspf/xspf.c
--- a/Plugins/Container/xspf/xspf.c	Thu Aug 10 22:40:31 2006 -0700
+++ b/Plugins/Container/xspf/xspf.c	Fri Aug 11 01:14:23 2006 -0700
@@ -143,6 +143,8 @@
 	xmlNodeSetPtr     n;
 	gint i;
 
+	g_return_if_fail(filename != NULL);
+
 	doc = xmlParseFile(filename);
 	if (doc == NULL)
 		return;
diff -r 3af18d169044 -r 4023a295db39 Plugins/Input/wma/wma.c
--- a/Plugins/Input/wma/wma.c	Thu Aug 10 22:40:31 2006 -0700
+++ b/Plugins/Input/wma/wma.c	Fri Aug 11 01:14:23 2006 -0700
@@ -22,6 +22,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
+#define _XOPEN_SOURCE 600
 #include <stdlib.h>
 #include <unistd.h>
 #include <math.h>
@@ -432,8 +433,8 @@
 	
     wma_ip.set_info(wsong_title, wsong_time, c->bit_rate, c->sample_rate, c->channels);
 
-    wma_s_outbuf = memalign(16, wma_st_buff);
-    wma_outbuf = memalign(16, AVCODEC_MAX_AUDIO_FRAME_SIZE);
+    posix_memalign((void *) &wma_s_outbuf, 16, wma_st_buff);
+    posix_memalign((void *) &wma_outbuf, 16, AVCODEC_MAX_AUDIO_FRAME_SIZE);
     wma_seekpos = -1;
     wma_decode = 1;
     wma_decode_thread = g_thread_create((GThreadFunc)wma_play_loop, NULL, TRUE, NULL);