changeset 384:a91923634161 trunk

[svn] - don't use deprecated function playlist_get().
author nenolod
date Fri, 15 Dec 2006 21:23:09 -0800
parents b211dcbec13f
children ac806e416c48
files ChangeLog src/m3u/m3u.c src/pls/pls.c src/xspf/xspf.c
diffstat 4 files changed, 17 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Dec 15 17:11:51 2006 -0800
+++ b/ChangeLog	Fri Dec 15 21:23:09 2006 -0800
@@ -1,3 +1,11 @@
+2006-12-16 01:11:51 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [838]
+  - fix wav.c improper initialization of wav_fmts()
+  
+  trunk/src/wav/wav.c |    4 ++++
+  1 file changed, 4 insertions(+)
+
+
 2006-12-15 02:24:21 +0000  William Pitcock <nenolod@nenolod.net>
   revision [836]
   - really fix HES/other multitrack this time
--- a/src/m3u/m3u.c	Fri Dec 15 17:11:51 2006 -0800
+++ b/src/m3u/m3u.c	Fri Dec 15 21:23:09 2006 -0800
@@ -144,8 +144,10 @@
     GList *node;
     gchar *outstr = NULL;
     VFSFile *file;
+    Playlist *playlist = playlist_get_active();
 
     g_return_if_fail(filename != NULL);
+    g_return_if_fail(playlist != NULL);
 
     file = vfs_fopen(filename, "wb");
 
@@ -156,7 +158,7 @@
 
     PLAYLIST_LOCK();
 
-    for (node = playlist_get(); node; node = g_list_next(node)) {
+    for (node = playlist->entries; node; node = g_list_next(node)) {
         PlaylistEntry *entry = PLAYLIST_ENTRY(node->data);
 
         if (entry->title && cfg.use_pl_metadata) {
--- a/src/pls/pls.c	Fri Dec 15 17:11:51 2006 -0800
+++ b/src/pls/pls.c	Fri Dec 15 21:23:09 2006 -0800
@@ -88,18 +88,20 @@
 {
     GList *node;
     VFSFile *file = vfs_fopen(filename, "wb");
+    Playlist *playlist = playlist_get_active();
 
     g_return_if_fail(file != NULL);
+    g_return_if_fail(playlist != NULL);
 
     vfs_fprintf(file, "[playlist]\n");
-    vfs_fprintf(file, "NumberOfEntries=%d\n", playlist_get_length(playlist_get_active()));
+    vfs_fprintf(file, "NumberOfEntries=%d\n", playlist_get_length(playlist));
 
     PLAYLIST_LOCK();
 
     for (node = playlist_get(); node; node = g_list_next(node)) {
         PlaylistEntry *entry = PLAYLIST_ENTRY(node->data);
 
-        vfs_fprintf(file, "File%d=%s\n", g_list_position(playlist_get(), node) + 1,
+        vfs_fprintf(file, "File%d=%s\n", g_list_position(playlist->entries, node) + 1,
                   entry->filename);
     }
 
--- a/src/xspf/xspf.c	Fri Dec 15 17:11:51 2006 -0800
+++ b/src/xspf/xspf.c	Fri Dec 15 21:23:09 2006 -0800
@@ -220,6 +220,7 @@
 	xmlDocPtr doc;
 	xmlNodePtr rootnode, tmp, tracklist;
 	GList *node;
+	Playlist *playlist = playlist_get_active();
 
 	doc = xmlNewDoc("1.0");
 
@@ -237,7 +238,7 @@
 
 	PLAYLIST_LOCK();
 
-	for (node = playlist_get(); node != NULL; node = g_list_next(node))
+	for (node = playlist->entries; node != NULL; node = g_list_next(node))
 	{
 		PlaylistEntry *entry = PLAYLIST_ENTRY(node->data);
 		xmlNodePtr track, location;