annotate src/xspf/xspf.c @ 1669:e1985da23d28

And yet more cleanups.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 08 Sep 2007 04:39:38 +0300
parents 4c088a45f839
children ae9b0327b620 62e89e392227
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
1 /*
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
2 * Audacious: A cross-platform multimedia player
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
3 * Copyright (c) 2006 William Pitcock, Tony Vroon, George Averill,
1667
7c32522b05b8 Add myself into credits.
Matti Hamalainen <ccr@tnsp.org>
parents: 1661
diff changeset
4 * Giacomo Lozito, Derek Pomery, Yoshiki Yazawa
7c32522b05b8 Add myself into credits.
Matti Hamalainen <ccr@tnsp.org>
parents: 1661
diff changeset
5 * and Matti Hämäläinen.
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
6 *
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
7 * This program is free software; you can redistribute it and/or modify
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
8 * it under the terms of the GNU General Public License as published by
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
9 * the Free Software Foundation; either version 2 of the License, or
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
10 * (at your option) any later version.
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
11 *
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
12 * This program is distributed in the hope that it will be useful,
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
15 * GNU General Public License for more details.
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
16 *
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
17 * You should have received a copy of the GNU General Public License
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
18 * along with this program; if not, write to the Free Software
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
20 */
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
21 #include <config.h>
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
22
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
23 #include <glib.h>
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
24 #include <string.h>
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
25 #include <stdlib.h>
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
26 #include <time.h>
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
27
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
28 #include <unistd.h>
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
29 #include <sys/types.h>
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
30 #include <sys/stat.h>
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
31 #include <sys/errno.h>
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
32
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
33 #include "audacious/main.h"
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
34 #include "audacious/util.h"
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
35 #include "audacious/playlist.h"
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
36 #include "audacious/playlist_container.h"
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
37 #include "audacious/plugin.h"
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
38
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
39 #include <libxml/tree.h>
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
40 #include <libxml/parser.h>
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
41 #include <libxml/xmlreader.h>
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
42 #include <libxml/xpath.h>
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
43 #include <libxml/xpathInternals.h>
641
3f0a3c24f2b9 [svn] libxspf improvements:
yaz
parents: 585
diff changeset
44 #include <libxml/uri.h>
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
45
641
3f0a3c24f2b9 [svn] libxspf improvements:
yaz
parents: 585
diff changeset
46 #define XSPF_ROOT_NODE_NAME "playlist"
3f0a3c24f2b9 [svn] libxspf improvements:
yaz
parents: 585
diff changeset
47 #define XSPF_XMLNS "http://xspf.org/ns/0/"
47
85d7e55b29d2 [svn] - redundant metadata has been removed.
yaz
parents: 12
diff changeset
48
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
49 enum {
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
50 CMP_DEF = 0,
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
51 CMP_GT,
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
52 CMP_NULL
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
53 } xspf_compare;
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
54
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
55 typedef struct {
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
56 gchar *tupleName;
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
57 gchar *xspfName;
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
58 TupleValueType type;
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
59 gboolean isMeta;
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
60 gint compare;
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
61 } xspf_entry_t;
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
62
47
85d7e55b29d2 [svn] - redundant metadata has been removed.
yaz
parents: 12
diff changeset
63
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
64 static const xspf_entry_t xspf_entries[] = {
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
65 { "title", "title", TUPLE_STRING, FALSE, CMP_DEF },
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
66 { "artist", "creator", TUPLE_STRING, FALSE, CMP_DEF },
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
67 { "comment", "annotation", TUPLE_STRING, FALSE, CMP_DEF },
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
68 { "album", "album", TUPLE_STRING, FALSE, CMP_DEF },
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
69 { "track-number", "trackNum", TUPLE_INT, FALSE, CMP_DEF },
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
70 { "length", "duration", TUPLE_INT, FALSE, CMP_GT },
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
71
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
72 { "year", "year", TUPLE_INT, TRUE, CMP_DEF },
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
73 { "date", "date", TUPLE_STRING, TRUE, CMP_DEF },
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
74 { "genre", "genre", TUPLE_STRING, TRUE, CMP_DEF },
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
75 { "formatter", "formatter", TUPLE_STRING, TRUE, CMP_DEF },
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
76 };
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
77
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
78 static const gint xspf_nentries = (sizeof(xspf_entries) / sizeof(xspf_entry_t));
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
79
641
3f0a3c24f2b9 [svn] libxspf improvements:
yaz
parents: 585
diff changeset
80
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
81 static gboolean is_uri(gchar *uri)
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
82 {
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
83 if(strstr(uri, "://"))
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
84 return TRUE;
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
85 else
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
86 return FALSE;
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
87 }
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
88
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
89 /* This function is taken from libxml2-2.6.27.
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
90 */
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
91 static xmlChar *xspf_path_to_uri(const xmlChar *path)
652
7f865e3cd285 [svn] - import xmlPathToURI() from libxml2-2.6.27 as audPathToURI(). this function is newly introduced at 2.6.27.
yaz
parents: 647
diff changeset
92 {
7f865e3cd285 [svn] - import xmlPathToURI() from libxml2-2.6.27 as audPathToURI(). this function is newly introduced at 2.6.27.
yaz
parents: 647
diff changeset
93 xmlURIPtr uri;
7f865e3cd285 [svn] - import xmlPathToURI() from libxml2-2.6.27 as audPathToURI(). this function is newly introduced at 2.6.27.
yaz
parents: 647
diff changeset
94 xmlURI temp;
7f865e3cd285 [svn] - import xmlPathToURI() from libxml2-2.6.27 as audPathToURI(). this function is newly introduced at 2.6.27.
yaz
parents: 647
diff changeset
95 xmlChar *ret, *cal;
7f865e3cd285 [svn] - import xmlPathToURI() from libxml2-2.6.27 as audPathToURI(). this function is newly introduced at 2.6.27.
yaz
parents: 647
diff changeset
96
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
97 if (path == NULL)
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
98 return NULL;
652
7f865e3cd285 [svn] - import xmlPathToURI() from libxml2-2.6.27 as audPathToURI(). this function is newly introduced at 2.6.27.
yaz
parents: 647
diff changeset
99
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
100 if ((uri = xmlParseURI((const char *)path)) != NULL) {
891
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
101 xmlFreeURI(uri);
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
102 return xmlStrdup(path);
652
7f865e3cd285 [svn] - import xmlPathToURI() from libxml2-2.6.27 as audPathToURI(). this function is newly introduced at 2.6.27.
yaz
parents: 647
diff changeset
103 }
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
104
652
7f865e3cd285 [svn] - import xmlPathToURI() from libxml2-2.6.27 as audPathToURI(). this function is newly introduced at 2.6.27.
yaz
parents: 647
diff changeset
105 cal = xmlCanonicPath(path);
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
106 if (cal == NULL)
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
107 return NULL;
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
108
652
7f865e3cd285 [svn] - import xmlPathToURI() from libxml2-2.6.27 as audPathToURI(). this function is newly introduced at 2.6.27.
yaz
parents: 647
diff changeset
109 memset(&temp, 0, sizeof(temp));
891
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
110 temp.path = (char *)cal;
652
7f865e3cd285 [svn] - import xmlPathToURI() from libxml2-2.6.27 as audPathToURI(). this function is newly introduced at 2.6.27.
yaz
parents: 647
diff changeset
111 ret = xmlSaveUri(&temp);
7f865e3cd285 [svn] - import xmlPathToURI() from libxml2-2.6.27 as audPathToURI(). this function is newly introduced at 2.6.27.
yaz
parents: 647
diff changeset
112 xmlFree(cal);
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
113
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
114 return ret;
652
7f865e3cd285 [svn] - import xmlPathToURI() from libxml2-2.6.27 as audPathToURI(). this function is newly introduced at 2.6.27.
yaz
parents: 647
diff changeset
115 }
7f865e3cd285 [svn] - import xmlPathToURI() from libxml2-2.6.27 as audPathToURI(). this function is newly introduced at 2.6.27.
yaz
parents: 647
diff changeset
116
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
117
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
118 static void xspf_add_file(xmlNode *track, const gchar *filename, gint pos, const gchar *base)
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
119 {
891
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
120 xmlNode *nptr;
1444
3b1651d37b58 xspf: update to new API
William Pitcock <nenolod@atheme-project.org>
parents: 1395
diff changeset
121 Tuple *tuple;
891
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
122 gchar *location = NULL;
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
123 Playlist *playlist = playlist_get_active();
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
124
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
125
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
126 tuple = tuple_new();
1444
3b1651d37b58 xspf: update to new API
William Pitcock <nenolod@atheme-project.org>
parents: 1395
diff changeset
127 tuple_associate_int(tuple, "length", -1);
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
128 tuple_associate_int(tuple, "mtime", -1);
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
129
641
3f0a3c24f2b9 [svn] libxspf improvements:
yaz
parents: 585
diff changeset
130
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
131 for (nptr = track->children; nptr != NULL; nptr = nptr->next) {
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
132 if (nptr->type == XML_ELEMENT_NODE) {
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
133 if (!xmlStrcmp(nptr->name, (xmlChar *)"location")) {
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
134 /* Location is a special case */
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
135 gchar *str = (gchar *)xmlNodeGetContent(nptr);
657
f46c9abe09d4 [svn] - do not unescape streaming uri.
yaz
parents: 652
diff changeset
136
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
137 location = g_strdup_printf("%s%s", base ? base : "", str);
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
138 xmlFree(str);
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
139 str = g_filename_from_uri(location, NULL, NULL);
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
140 if (str) {
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
141 g_free(location);
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
142 location = g_strdup_printf("file://%s", str);
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
143 }
1594
78d8dd386d0b Kludge xspf plugin to "work" better with playlist entries which have
Matti Hamalainen <ccr@tnsp.org>
parents: 1547
diff changeset
144
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
145 g_free(str);
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
146 } else {
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
147 /* Rest of the nodes are handled here */
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
148 gint i;
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
149 gboolean isMeta;
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
150 xmlChar *findName;
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
151
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
152 if (!xmlStrcmp(nptr->name, (xmlChar *)"meta")) {
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
153 isMeta = TRUE;
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
154 findName = xmlGetProp(nptr, (xmlChar *)"rel");
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
155 } else {
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
156 isMeta = FALSE;
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
157 findName = xmlStrdup(nptr->name);
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
158 }
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
159
1669
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
160 for (i = 0; i < xspf_nentries; i++)
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
161 if ((xspf_entries[i].isMeta == isMeta) &&
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
162 !xmlStrcmp(findName, (xmlChar *)xspf_entries[i].xspfName)) {
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
163 xmlChar *str = xmlNodeGetContent(nptr);
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
164 switch (xspf_entries[i].type) {
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
165 case TUPLE_STRING:
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
166 tuple_associate_string(tuple, xspf_entries[i].tupleName, (gchar *)str);
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
167 break;
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
168
1669
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
169 case TUPLE_INT:
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
170 tuple_associate_int(tuple, xspf_entries[i].tupleName, atol((char *)str));
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
171 break;
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
172
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
173 default:
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
174 break;
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
175 }
1669
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
176 xmlFree(str);
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
177 break;
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
178 }
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
179
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
180 xmlFree(findName);
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
181 }
891
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
182 }
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
183 }
47
85d7e55b29d2 [svn] - redundant metadata has been removed.
yaz
parents: 12
diff changeset
184
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
185 if (location) {
1278
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
186 gchar *uri = NULL;
1444
3b1651d37b58 xspf: update to new API
William Pitcock <nenolod@atheme-project.org>
parents: 1395
diff changeset
187 gchar *scratch;
3b1651d37b58 xspf: update to new API
William Pitcock <nenolod@atheme-project.org>
parents: 1395
diff changeset
188
3b1651d37b58 xspf: update to new API
William Pitcock <nenolod@atheme-project.org>
parents: 1395
diff changeset
189 scratch = g_path_get_basename(location);
3b1651d37b58 xspf: update to new API
William Pitcock <nenolod@atheme-project.org>
parents: 1395
diff changeset
190 tuple_associate_string(tuple, "file-name", scratch);
3b1651d37b58 xspf: update to new API
William Pitcock <nenolod@atheme-project.org>
parents: 1395
diff changeset
191 g_free(scratch);
3b1651d37b58 xspf: update to new API
William Pitcock <nenolod@atheme-project.org>
parents: 1395
diff changeset
192
3b1651d37b58 xspf: update to new API
William Pitcock <nenolod@atheme-project.org>
parents: 1395
diff changeset
193 scratch = g_path_get_dirname(location);
3b1651d37b58 xspf: update to new API
William Pitcock <nenolod@atheme-project.org>
parents: 1395
diff changeset
194 tuple_associate_string(tuple, "file-path", scratch);
3b1651d37b58 xspf: update to new API
William Pitcock <nenolod@atheme-project.org>
parents: 1395
diff changeset
195 g_free(scratch);
3b1651d37b58 xspf: update to new API
William Pitcock <nenolod@atheme-project.org>
parents: 1395
diff changeset
196
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
197 tuple_associate_string(tuple, "file-ext", strrchr(location, '.'));
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
198
1278
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
199 #ifdef DEBUG
1444
3b1651d37b58 xspf: update to new API
William Pitcock <nenolod@atheme-project.org>
parents: 1395
diff changeset
200 printf("xspf: tuple->file_name = %s\n", tuple_get_string(tuple, "file-name"));
3b1651d37b58 xspf: update to new API
William Pitcock <nenolod@atheme-project.org>
parents: 1395
diff changeset
201 printf("xspf: tuple->file_path = %s\n", tuple_get_string(tuple, "file-path"));
1278
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
202 #endif
891
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
203 // add file to playlist
1278
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
204 uri = g_filename_to_uri(location, NULL, NULL);
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
205 // uri would be NULL if location is already uri. --yaz
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
206 playlist_load_ins_file_tuple(playlist, uri ? uri: location, filename, pos, tuple);
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
207 g_free(uri);
891
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
208 pos++;
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
209 }
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
210
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
211 g_free(location);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
212 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
213
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
214
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
215 static void xspf_find_track(xmlNode *tracklist, const gchar *filename, gint pos, const gchar *base)
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
216 {
891
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
217 xmlNode *nptr;
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
218
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
219 for (nptr = tracklist->children; nptr != NULL; nptr = nptr->next) {
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
220 if (nptr->type == XML_ELEMENT_NODE &&
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
221 !xmlStrcmp(nptr->name, (xmlChar *)"track")) {
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
222 xspf_add_file(nptr, filename, pos, base);
891
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
223 }
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
224 }
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
225 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
226
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
227
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
228 static void xspf_find_audoptions(xmlNode *tracklist, const gchar *filename, gint pos)
641
3f0a3c24f2b9 [svn] libxspf improvements:
yaz
parents: 585
diff changeset
229 {
891
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
230 xmlNode *nptr;
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
231 Playlist *playlist = playlist_get_active();
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
232
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
233 for (nptr = tracklist->children; nptr != NULL; nptr = nptr->next) {
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
234 if (nptr->type == XML_ELEMENT_NODE &&
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
235 !xmlStrcmp(nptr->name, (xmlChar *)"options")) {
891
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
236 xmlChar *opt = NULL;
884
4fd90f2d1832 [svn] improve support for static playlist:
yaz
parents: 657
diff changeset
237
891
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
238 opt = xmlGetProp(nptr, (xmlChar *)"staticlist");
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
239 if (!g_strcasecmp((char *)opt, "true"))
891
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
240 playlist->attribute |= PLAYLIST_STATIC;
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
241 else
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
242 playlist->attribute ^= PLAYLIST_STATIC;
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
243
891
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
244 xmlFree(opt);
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
245 opt = NULL;
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
246 }
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
247 }
641
3f0a3c24f2b9 [svn] libxspf improvements:
yaz
parents: 585
diff changeset
248 }
3f0a3c24f2b9 [svn] libxspf improvements:
yaz
parents: 585
diff changeset
249
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
250
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
251 static void xspf_playlist_load(const gchar *filename, gint pos)
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
252 {
891
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
253 xmlDocPtr doc;
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
254 xmlNode *nptr, *nptr2;
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
255 gchar *tmp = NULL, *base = NULL;
891
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
256
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
257 g_return_if_fail(filename != NULL);
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
258
1278
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
259 #ifdef DEBUG
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
260 printf("playlist_load_xspf: filename = %s\n", filename);
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
261 #endif
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
262
1512
7b1b24af319f now xspf plugin try to load non well formed xspf file. closes #969.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1462
diff changeset
263 doc = xmlRecoverFile(filename);
891
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
264 if(doc == NULL)
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
265 return;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
266
891
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
267 // find trackList
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
268 for (nptr = doc->children; nptr != NULL; nptr = nptr->next) {
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
269 if (nptr->type == XML_ELEMENT_NODE &&
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
270 !xmlStrcmp(nptr->name, (xmlChar *)"playlist")) {
891
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
271 base = (gchar *)xmlNodeGetBase(doc, nptr);
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
272 #ifdef DEBUG
1278
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
273 printf("playlist_load_xspf: base @1 = %s\n", base);
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
274 #endif
1278
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
275 // if filename is specified as a base, ignore it.
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
276 tmp = xmlURIUnescapeString(base, -1, NULL);
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
277 if(tmp) {
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
278 if(!strcmp(tmp, filename)) {
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
279 xmlFree(base);
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
280 base = NULL;
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
281 }
1278
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
282 g_free(tmp);
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
283 tmp = NULL;
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
284 }
1278
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
285 #ifdef DEBUG
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
286 printf("playlist_load_xspf: base @2 = %s\n", base);
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
287 #endif
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
288 for (nptr2 = nptr->children; nptr2 != NULL; nptr2 = nptr2->next) {
641
3f0a3c24f2b9 [svn] libxspf improvements:
yaz
parents: 585
diff changeset
289
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
290 if (nptr2->type == XML_ELEMENT_NODE &&
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
291 !xmlStrcmp(nptr2->name, (xmlChar *)"extension")) {
641
3f0a3c24f2b9 [svn] libxspf improvements:
yaz
parents: 585
diff changeset
292 //check if application is audacious
3f0a3c24f2b9 [svn] libxspf improvements:
yaz
parents: 585
diff changeset
293 xmlChar *app = NULL;
3f0a3c24f2b9 [svn] libxspf improvements:
yaz
parents: 585
diff changeset
294 app = xmlGetProp(nptr2, (xmlChar *)"application");
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
295 if (!xmlStrcmp(app, (xmlChar *)"audacious"))
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
296 xspf_find_audoptions(nptr2, filename, pos);
641
3f0a3c24f2b9 [svn] libxspf improvements:
yaz
parents: 585
diff changeset
297 xmlFree(app);
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
298 } else
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
299 if (nptr2->type == XML_ELEMENT_NODE &&
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
300 !xmlStrcmp(nptr2->name, (xmlChar *)"title")) {
1528
8fddba1d94e4 xspf: When loading playlist, read title from xml if set
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents: 1514
diff changeset
301 Playlist *plist = playlist_get_active();
8fddba1d94e4 xspf: When loading playlist, read title from xml if set
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents: 1514
diff changeset
302 xmlChar *title = xmlNodeGetContent(nptr2);
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
303
1528
8fddba1d94e4 xspf: When loading playlist, read title from xml if set
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents: 1514
diff changeset
304 if (title && *title) {
8fddba1d94e4 xspf: When loading playlist, read title from xml if set
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents: 1514
diff changeset
305 gchar *old = plist->title;
8fddba1d94e4 xspf: When loading playlist, read title from xml if set
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents: 1514
diff changeset
306 plist->title = g_strdup((gchar*)title);
1547
b63e772ee21d Useless use of if() with g_free().
Matti Hamalainen <ccr@tnsp.org>
parents: 1546
diff changeset
307 g_free(old);
1528
8fddba1d94e4 xspf: When loading playlist, read title from xml if set
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents: 1514
diff changeset
308 }
8fddba1d94e4 xspf: When loading playlist, read title from xml if set
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents: 1514
diff changeset
309 xmlFree(title);
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
310 } else
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
311 if(nptr2->type == XML_ELEMENT_NODE &&
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
312 !xmlStrcmp(nptr2->name, (xmlChar *)"trackList")) {
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
313 xspf_find_track(nptr2, filename, pos, base);
891
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
314 }
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
315 }
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
316 }
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
317 }
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
318 xmlFreeDoc(doc);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
319 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
320
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
321
1668
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
322 static void xspf_add_node(
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
323 xmlNodePtr node, TupleValueType type, gboolean isMeta,
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
324 const gchar *xspfName, const gchar *strVal, const gint intVal)
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
325 {
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
326 gchar tmps[64];
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
327 xmlNodePtr tmp;
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
328
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
329 if (isMeta) {
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
330 tmp = xmlNewNode(NULL, (xmlChar *) "meta");
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
331 xmlSetProp(tmp, (xmlChar *) "rel", (xmlChar *) xspfName);
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
332 } else
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
333 tmp = xmlNewNode(NULL, (xmlChar *) xspfName);
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
334
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
335 switch (type) {
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
336 case TUPLE_STRING:
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
337 xmlAddChild(tmp, xmlNewText((xmlChar *) strVal));
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
338 break;
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
339
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
340 case TUPLE_INT:
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
341 g_snprintf(tmps, sizeof(tmps), "%d", intVal);
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
342 xmlAddChild(tmp, xmlNewText((xmlChar *) tmps));
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
343 break;
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
344
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
345 default:
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
346 break;
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
347 }
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
348
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
349 xmlAddChild(node, tmp);
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
350 }
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
351
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
352
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
353 static void xspf_playlist_save(const gchar *filename, gint pos)
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
354 {
891
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
355 xmlDocPtr doc;
1669
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
356 xmlNodePtr rootnode, tracklist;
891
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
357 GList *node;
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
358 gint baselen = 0;
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
359 gchar *base = NULL;
891
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
360 Playlist *playlist = playlist_get_active();
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
361
1278
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
362 #ifdef DEBUG
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
363 printf("playlist_save_xspf: filename = %s\n", filename);
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
364 #endif
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
365
891
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
366 doc = xmlNewDoc((xmlChar *)"1.0");
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
367 doc->charset = XML_CHAR_ENCODING_UTF8;
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
368 doc->encoding = xmlStrdup((xmlChar *)"UTF-8");
585
2d20bc58a290 [svn] tweak xspf plugin to conform xspf specification version 1.
yaz
parents: 577
diff changeset
369
891
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
370 rootnode = xmlNewNode(NULL, (xmlChar *)XSPF_ROOT_NODE_NAME);
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
371 xmlSetProp(rootnode, (xmlChar *)"version", (xmlChar *)"1");
891
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
372 xmlSetProp(rootnode, (xmlChar *)"xmlns", (xmlChar *)XSPF_XMLNS);
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
373
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
374 PLAYLIST_LOCK(playlist->mutex);
1278
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
375
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
376 /* relative */
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
377 if (playlist->attribute & PLAYLIST_USE_RELATIVE) {
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
378 /* prescan to determine base uri */
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
379 for (node = playlist->entries; node != NULL; node = g_list_next(node)) {
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
380 gchar *ptr1, *ptr2;
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
381 PlaylistEntry *entry = PLAYLIST_ENTRY(node->data);
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
382 gchar *tmp;
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
383 gint tmplen = 0;
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
384
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
385 if (!is_uri(entry->filename)) { //obsolete
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
386 gchar *tmp2;
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
387 tmp2 = g_path_get_dirname(entry->filename);
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
388 tmp = g_strdup_printf("%s/", tmp2);
1669
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
389 g_free(tmp2);
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
390 } else {
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
391 tmp = g_strdup(entry->filename);
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
392 }
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
393
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
394 if(!base) {
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
395 base = strdup(tmp);
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
396 baselen = strlen(base);
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
397 }
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
398
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
399 ptr1 = base;
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
400 ptr2 = tmp;
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
401
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
402 while(ptr1 && ptr2 && *ptr1 && *ptr2 && *ptr1 == *ptr2) {
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
403 ptr1++;
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
404 ptr2++;
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
405 }
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
406
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
407 *ptr2 = '\0'; //terminate
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
408 tmplen = ptr2 - tmp;
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
409
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
410 if (tmplen <= baselen) {
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
411 g_free(base);
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
412 base = tmp;
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
413 baselen = tmplen;
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
414 #ifdef DEBUG
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
415 printf("base = \"%s\" baselen = %d\n", base, baselen);
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
416 #endif
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
417 }
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
418 else {
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
419 g_free(tmp);
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
420 tmp = NULL;
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
421 }
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
422 }
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
423
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
424 /* set base URI */
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
425 if (base) {
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
426 gchar *tmp;
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
427 if(!is_uri(base)) {
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
428 tmp = (gchar *) xspf_path_to_uri((xmlChar *)base);
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
429 if(tmp) {
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
430 g_free(base);
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
431 base = tmp;
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
432 }
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
433 }
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
434
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
435 if(!is_uri(base)) {
1278
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
436 #ifdef DEBUG
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
437 printf("base is not uri. something is wrong.\n");
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
438 #endif
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
439 tmp = g_strdup_printf("file://%s", base);
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
440 xmlSetProp(rootnode, (xmlChar *)"xml:base", (xmlChar *)tmp);
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
441 g_free(tmp);
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
442 }
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
443 else
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
444 xmlSetProp(rootnode, (xmlChar *)"xml:base", (xmlChar *)base);
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
445 }
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
446 } /* USE_RELATIVE */
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
447
1278
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
448 /* common */
891
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
449 xmlDocSetRootElement(doc, rootnode);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
450
1669
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
451 xspf_add_node(rootnode, TUPLE_STRING, FALSE, "creator", PACKAGE "-" VERSION, 0);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
452
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
453 /* add staticlist marker */
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
454 if (playlist->attribute & PLAYLIST_STATIC) {
891
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
455 xmlNodePtr extension, options;
884
4fd90f2d1832 [svn] improve support for static playlist:
yaz
parents: 657
diff changeset
456
891
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
457 extension = xmlNewNode(NULL, (xmlChar *)"extension");
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
458 xmlSetProp(extension, (xmlChar *)"application", (xmlChar *)"audacious");
884
4fd90f2d1832 [svn] improve support for static playlist:
yaz
parents: 657
diff changeset
459
891
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
460 options = xmlNewNode(NULL, (xmlChar *)"options");
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
461 xmlSetProp(options, (xmlChar *)"staticlist", (xmlChar *)"true");
884
4fd90f2d1832 [svn] improve support for static playlist:
yaz
parents: 657
diff changeset
462
891
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
463 xmlAddChild(extension, options);
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
464 xmlAddChild(rootnode, extension);
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
465 }
884
4fd90f2d1832 [svn] improve support for static playlist:
yaz
parents: 657
diff changeset
466
1531
10cfa5b51bce xspf: Store playlist title when saving playlist
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents: 1528
diff changeset
467 /* save playlist title */
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
468 if (playlist->title && playlist->title[0] &&
1669
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
469 g_utf8_validate(playlist->title, -1, NULL))
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
470 xspf_add_node(rootnode, TUPLE_STRING, FALSE, "title", playlist->title, 0);
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
471
1531
10cfa5b51bce xspf: Store playlist title when saving playlist
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents: 1528
diff changeset
472
891
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
473 tracklist = xmlNewNode(NULL, (xmlChar *)"trackList");
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
474 xmlAddChild(rootnode, tracklist);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
475
891
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
476 for(node = playlist->entries; node != NULL; node = g_list_next(node)) {
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
477 PlaylistEntry *entry = PLAYLIST_ENTRY(node->data);
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
478 xmlNodePtr track, location;
1668
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
479 gchar *filename = NULL;
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
480 const gchar *scratch = NULL;
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
481 gint scratchi = 0;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
482
891
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
483 track = xmlNewNode(NULL, (xmlChar *)"track");
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
484 location = xmlNewNode(NULL, (xmlChar *)"location");
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
485
1278
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
486 if(is_uri(entry->filename)) { /* uri */
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
487 #ifdef DEBUG
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
488 printf("filename is uri\n");
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
489 #endif
1278
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
490 filename = g_strdup(entry->filename + baselen); // entry->filename is always uri now.
891
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
491 }
1278
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
492 else { /* local file (obsolete) */
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
493 gchar *tmp = (gchar *) xspf_path_to_uri((const xmlChar *)entry->filename + baselen);
1278
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
494 if(base) { /* relative */
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
495 filename = g_strdup_printf("%s", tmp);
1546
a8436c6e3753 Some cleanups; Removed useless heap allocations, use a small static buffer
Matti Hamalainen <ccr@tnsp.org>
parents: 1531
diff changeset
496 } else {
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
497 #ifdef DEBUG
1278
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
498 printf("absolute and local (obsolete)\n");
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
499 #endif
1278
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
500 filename = g_filename_to_uri(tmp, NULL, NULL);
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
501 }
1278
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
502 g_free(tmp); tmp = NULL;
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
503 } /* obsolete */
585
2d20bc58a290 [svn] tweak xspf plugin to conform xspf specification version 1.
yaz
parents: 577
diff changeset
504
891
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
505 if(!g_utf8_validate(filename, -1, NULL))
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
506 continue;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
507
891
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
508 xmlAddChild(location, xmlNewText((xmlChar *)filename));
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
509 xmlAddChild(track, location);
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
510 xmlAddChild(tracklist, track);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
511
1669
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
512 /* Do we have a tuple? */
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
513 if (entry->tuple != NULL) {
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
514 gint i;
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
515 for (i = 0; i < xspf_nentries; i++) {
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
516 const xspf_entry_t *xs = &xspf_entries[i];
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
517 gboolean isOK = FALSE;
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
518
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
519 switch (xs->type) {
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
520 case TUPLE_STRING:
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
521 scratch = tuple_get_string(entry->tuple, xs->tupleName);
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
522 switch (xs->compare) {
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
523 case CMP_DEF: isOK = (scratch != NULL); break;
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
524 case CMP_NULL: isOK = (scratch == NULL); break;
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
525 }
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
526 if (scratch != NULL && !g_utf8_validate(scratch, -1, NULL))
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
527 isOK = FALSE;
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
528 break;
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
529
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
530 case TUPLE_INT:
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
531 scratchi = tuple_get_int(entry->tuple, xs->tupleName);
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
532 switch (xs->compare) {
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
533 case CMP_DEF: isOK = (scratchi != 0); break;
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
534 case CMP_GT: isOK = (scratchi > 0); break;
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
535 }
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
536 break;
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
537
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
538 default:
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
539 break;
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
540 }
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
541
1668
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
542 if (isOK)
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
543 xspf_add_node(track, xs->type, xs->isMeta, xs->xspfName, scratch, scratchi);
891
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
544 }
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
545
1669
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
546 /* Write mtime unconditionally to support staticlist */
1668
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
547 xspf_add_node(track, TUPLE_INT, TRUE, "mtime", NULL, tuple_get_int(entry->tuple, "mtime"));
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
548 } else {
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
549
1668
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
550 if (entry->title != NULL && g_utf8_validate(entry->title, -1, NULL))
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
551 xspf_add_node(track, TUPLE_STRING, FALSE, "title", entry->title, 0);
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
552
1668
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
553 if (entry->length > 0)
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
554 xspf_add_node(track, TUPLE_INT, FALSE, "duration", NULL, entry->length);
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
555
1669
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
556 /* Add mtime of -1 */
1668
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
557 xspf_add_node(track, TUPLE_INT, TRUE, "mtime", NULL, -1);
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
558 }
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
559
891
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
560 g_free(filename);
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
561 filename = NULL;
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
562 }
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
563
891
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
564 PLAYLIST_UNLOCK(playlist->mutex);
92
fadf346ddde3 [svn] - pls doesn't go along with PLAYLIST_LOCK in playlist_save().
yaz
parents: 87
diff changeset
565
891
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
566 xmlSaveFormatFile(filename, doc, 1);
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
567 xmlFreeDoc(doc);
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
568 doc = NULL;
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
569
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
570 xmlFree(base);
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
571 base = NULL;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
572 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
573
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
574
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
575 PlaylistContainer plc_xspf = {
891
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
576 .name = "XSPF Playlist Format",
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
577 .ext = "xspf",
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
578 .plc_read = xspf_playlist_load,
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
579 .plc_write = xspf_playlist_save,
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
580 };
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
581
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
582 static void xspf_init(void)
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
583 {
891
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
584 playlist_container_register(&plc_xspf);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
585 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
586
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
587 static void xspf_cleanup(void)
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
588 {
891
502222ed5dd4 [svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.
yaz
parents: 884
diff changeset
589 playlist_container_unregister(&plc_xspf);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
590 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
591
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
592 DECLARE_PLUGIN(xspf, xspf_init, xspf_cleanup, NULL, NULL, NULL, NULL, NULL, NULL);