changeset 92:fadf346ddde3 trunk

[svn] - pls doesn't go along with PLAYLIST_LOCK in playlist_save().
author yaz
date Thu, 12 Oct 2006 21:13:45 -0700
parents 6e1002ea4ded
children a793fb91ecde
files ChangeLog src/m3u/m3u.c src/xspf/xspf.c
diffstat 3 files changed, 17 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Oct 12 09:05:01 2006 -0700
+++ b/ChangeLog	Thu Oct 12 21:13:45 2006 -0700
@@ -1,3 +1,12 @@
+2006-10-12 16:05:01 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [182]
+  - some seek code (can't be implemented right now though)
+  - change `return 1' to `return NULL' in decode_thread().
+  
+  trunk/src/alac/plugin.c |   23 ++++++++++++++++++++---
+  1 file changed, 20 insertions(+), 3 deletions(-)
+
+
 2006-10-12 13:21:12 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
   revision [180]
   - fix for lock contention on saving m3u. locking playlist has been done in playlist_save().
--- a/src/m3u/m3u.c	Thu Oct 12 09:05:01 2006 -0700
+++ b/src/m3u/m3u.c	Thu Oct 12 21:13:45 2006 -0700
@@ -153,6 +153,8 @@
     if (cfg.use_pl_metadata)
         vfs_fprintf(file, "#EXTM3U\n");
 
+    PLAYLIST_LOCK();
+
     for (node = playlist_get(); node; node = g_list_next(node)) {
         PlaylistEntry *entry = PLAYLIST_ENTRY(node->data);
 
@@ -177,6 +179,8 @@
         vfs_fprintf(file, "%s\n", entry->filename);
     }
 
+    PLAYLIST_UNLOCK();
+
     vfs_fclose(file);
 }
 
--- a/src/xspf/xspf.c	Thu Oct 12 09:05:01 2006 -0700
+++ b/src/xspf/xspf.c	Thu Oct 12 21:13:45 2006 -0700
@@ -228,6 +228,8 @@
 	tracklist = xmlNewNode(NULL, "trackList");
 	xmlAddChild(rootnode, tracklist);
 
+	PLAYLIST_LOCK();
+
 	for (node = playlist_get(); node != NULL; node = g_list_next(node))
 	{
 		PlaylistEntry *entry = PLAYLIST_ENTRY(node->data);
@@ -383,6 +385,8 @@
 
 	}
 
+	PLAYLIST_UNLOCK();
+
 	xmlSaveFormatFile(filename, doc, 1);
 	xmlFreeDoc(doc);
 }