diff src/xspf/xspf.c @ 2057:cf4fa45ffd80

playlist API vtabling
author William Pitcock <nenolod@atheme.org>
date Sat, 13 Oct 2007 23:09:40 -0500
parents 059bd21a0c80
children fe479ddb4f4e
line wrap: on
line diff
--- a/src/xspf/xspf.c	Sat Oct 13 21:06:30 2007 -0500
+++ b/src/xspf/xspf.c	Sat Oct 13 23:09:40 2007 -0500
@@ -129,7 +129,7 @@
     xmlNode *nptr;
     Tuple *tuple;
     gchar *location = NULL;
-    Playlist *playlist = playlist_get_active();
+    Playlist *playlist = aud_playlist_get_active();
 
 
     tuple = aud_tuple_new();
@@ -211,7 +211,7 @@
         // add file to playlist
         uri = g_filename_to_uri(location, NULL, NULL);
         // uri would be NULL if location is already uri. --yaz
-        playlist_load_ins_file_tuple(playlist, uri ? uri: location, filename, pos, tuple);
+        aud_playlist_load_ins_file_tuple(playlist, uri ? uri: location, filename, pos, tuple);
         g_free(uri);
         pos++;
     }
@@ -237,7 +237,7 @@
 static void xspf_find_audoptions(xmlNode *tracklist, const gchar *filename, gint pos)
 {
     xmlNode *nptr;
-    Playlist *playlist = playlist_get_active();
+    Playlist *playlist = aud_playlist_get_active();
 
     for (nptr = tracklist->children; nptr != NULL; nptr = nptr->next) {
         if (nptr->type == XML_ELEMENT_NODE &&
@@ -304,11 +304,11 @@
                 } else
                 if (nptr2->type == XML_ELEMENT_NODE &&
                     !xmlStrcmp(nptr2->name, (xmlChar *)"title")) {
-                    Playlist *plist = playlist_get_active();
+                    Playlist *plist = aud_playlist_get_active();
                     xmlChar *title = xmlNodeGetContent(nptr2);
                     
                     if (title && *title) {
-                        playlist_set_current_name(plist, (gchar*)title);
+                        aud_playlist_set_current_name(plist, (gchar*)title);
                     }
                     xmlFree(title);
                 } else
@@ -361,7 +361,7 @@
     GList *node;
     gint baselen = 0;
     gchar *base = NULL;
-    Playlist *playlist = playlist_get_active();
+    Playlist *playlist = aud_playlist_get_active();
 
     XSDEBUG("filename='%s', pos=%d\n", filename, pos);