annotate src/xspf/xspf.c @ 2512:1f6b5f5768e2

Remove some completely useless null-pointer checks, g_free() checks the pointer anyway.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 02 Apr 2008 22:58:35 +0300
parents 42a5c9d5830b
children bd3a24b39058
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 */
2213
137187e7a379 make use of AUDDBG() for debug print out.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2170
diff changeset
21
137187e7a379 make use of AUDDBG() for debug print out.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2170
diff changeset
22 /* #define AUD_DEBUG 1 */
137187e7a379 make use of AUDDBG() for debug print out.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2170
diff changeset
23
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
24 #include <config.h>
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
25
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
26 #include <glib.h>
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
27 #include <string.h>
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
28 #include <stdlib.h>
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
29 #include <time.h>
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
30
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
31 #include <unistd.h>
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
32 #include <sys/types.h>
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
33 #include <sys/stat.h>
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
34 #include <sys/errno.h>
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
35
1962
076126300dd8 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 1952
diff changeset
36 #include <audacious/plugin.h>
1950
2ebeb7816c5e Change from "" to <>-style includes. With thanks to ccr for the correct sed voodoo.
chainsaw@localhost
parents: 1701
diff changeset
37 #include <audacious/util.h>
2166
9fa5a7884514 unescape uri before write into tuple.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2126
diff changeset
38 #include <audacious/strings.h>
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
39
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
40 #include <libxml/tree.h>
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
41 #include <libxml/parser.h>
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
42 #include <libxml/xmlreader.h>
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
43 #include <libxml/xpath.h>
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
44 #include <libxml/xpathInternals.h>
641
3f0a3c24f2b9 [svn] libxspf improvements:
yaz
parents: 585
diff changeset
45 #include <libxml/uri.h>
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
46
641
3f0a3c24f2b9 [svn] libxspf improvements:
yaz
parents: 585
diff changeset
47 #define XSPF_ROOT_NODE_NAME "playlist"
3f0a3c24f2b9 [svn] libxspf improvements:
yaz
parents: 585
diff changeset
48 #define XSPF_XMLNS "http://xspf.org/ns/0/"
47
85d7e55b29d2 [svn] - redundant metadata has been removed.
yaz
parents: 12
diff changeset
49
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
50 enum {
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
51 CMP_DEF = 0,
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
52 CMP_GT,
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
53 CMP_NULL
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
54 } xspf_compare;
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
55
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
56 typedef struct {
1693
62e89e392227 Branch merge.
Matti Hamalainen <ccr@tnsp.org>
parents: 1687 1669
diff changeset
57 gint tupleField;
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
58 gchar *xspfName;
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
59 TupleValueType type;
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
60 gboolean isMeta;
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
61 gint compare;
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
62 } xspf_entry_t;
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
63
47
85d7e55b29d2 [svn] - redundant metadata has been removed.
yaz
parents: 12
diff changeset
64
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
65 static const xspf_entry_t xspf_entries[] = {
1693
62e89e392227 Branch merge.
Matti Hamalainen <ccr@tnsp.org>
parents: 1687 1669
diff changeset
66 { FIELD_TITLE, "title", TUPLE_STRING, FALSE, CMP_DEF },
62e89e392227 Branch merge.
Matti Hamalainen <ccr@tnsp.org>
parents: 1687 1669
diff changeset
67 { FIELD_ARTIST, "creator", TUPLE_STRING, FALSE, CMP_DEF },
62e89e392227 Branch merge.
Matti Hamalainen <ccr@tnsp.org>
parents: 1687 1669
diff changeset
68 { FIELD_COMMENT, "annotation", TUPLE_STRING, FALSE, CMP_DEF },
62e89e392227 Branch merge.
Matti Hamalainen <ccr@tnsp.org>
parents: 1687 1669
diff changeset
69 { FIELD_ALBUM, "album", TUPLE_STRING, FALSE, CMP_DEF },
62e89e392227 Branch merge.
Matti Hamalainen <ccr@tnsp.org>
parents: 1687 1669
diff changeset
70 { FIELD_TRACK_NUMBER, "trackNum", TUPLE_INT, FALSE, CMP_DEF },
62e89e392227 Branch merge.
Matti Hamalainen <ccr@tnsp.org>
parents: 1687 1669
diff changeset
71 { FIELD_LENGTH, "duration", TUPLE_INT, FALSE, CMP_GT },
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
72
1693
62e89e392227 Branch merge.
Matti Hamalainen <ccr@tnsp.org>
parents: 1687 1669
diff changeset
73 { FIELD_YEAR, "year", TUPLE_INT, TRUE, CMP_DEF },
62e89e392227 Branch merge.
Matti Hamalainen <ccr@tnsp.org>
parents: 1687 1669
diff changeset
74 { FIELD_DATE, "date", TUPLE_STRING, TRUE, CMP_DEF },
62e89e392227 Branch merge.
Matti Hamalainen <ccr@tnsp.org>
parents: 1687 1669
diff changeset
75 { FIELD_GENRE, "genre", TUPLE_STRING, TRUE, CMP_DEF },
2234
ef61e0c66000 xspf had not read mtime from some time.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2213
diff changeset
76 { FIELD_MTIME, "mtime", TUPLE_INT, TRUE, CMP_DEF },
1693
62e89e392227 Branch merge.
Matti Hamalainen <ccr@tnsp.org>
parents: 1687 1669
diff changeset
77 { FIELD_FORMATTER, "formatter", TUPLE_STRING, TRUE, CMP_DEF },
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
78 };
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
79
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
80 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
81
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
82 static gboolean is_uri(gchar *uri)
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
83 {
1964
375950feec51 Cosmetic whitespace changes.
Matti Hamalainen <ccr@tnsp.org>
parents: 1963
diff changeset
84 if (strstr(uri, "://"))
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
85 return TRUE;
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
86 else
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
87 return FALSE;
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
88 }
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
89
1963
b9b62802b072 Define a preprocessor macro XSDEBUG() for printing debugging messages, if DEBUG is defined.
Matti Hamalainen <ccr@tnsp.org>
parents: 1962
diff changeset
90
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
91 /* 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
92 */
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
93 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
94 {
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 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
96 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
97 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
98
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
99 if (path == NULL)
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
100 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
101
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
102 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
103 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
104 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
105 }
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
106
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
107 cal = xmlCanonicPath(path);
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
108 if (cal == NULL)
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
109 return NULL;
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
110
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 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
112 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
113 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
114 xmlFree(cal);
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
115
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
116 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
117 }
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
118
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
119
1962
076126300dd8 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 1952
diff changeset
120 static void xspf_add_file(xmlNode *track, const gchar *filename,
076126300dd8 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 1952
diff changeset
121 gint pos, const gchar *base)
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
122 {
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
123 xmlNode *nptr;
1444
3b1651d37b58 xspf: update to new API
William Pitcock <nenolod@atheme-project.org>
parents: 1395
diff changeset
124 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
125 gchar *location = NULL;
2057
cf4fa45ffd80 playlist API vtabling
William Pitcock <nenolod@atheme.org>
parents: 2053
diff changeset
126 Playlist *playlist = aud_playlist_get_active();
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
127
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
128
1976
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1966
diff changeset
129 tuple = aud_tuple_new();
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1966
diff changeset
130 aud_tuple_associate_int(tuple, FIELD_LENGTH, NULL, -1);
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1966
diff changeset
131 aud_tuple_associate_int(tuple, FIELD_MTIME, NULL, -1);
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
132
641
3f0a3c24f2b9 [svn] libxspf improvements:
yaz
parents: 585
diff changeset
133
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
134 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
135 if (nptr->type == XML_ELEMENT_NODE) {
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
136 if (!xmlStrcmp(nptr->name, (xmlChar *)"location")) {
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
137 /* Location is a special case */
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
138 gchar *str = (gchar *)xmlNodeGetContent(nptr);
657
f46c9abe09d4 [svn] - do not unescape streaming uri.
yaz
parents: 652
diff changeset
139
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
140 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
141 xmlFree(str);
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
142 } else {
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
143 /* Rest of the nodes are handled here */
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
144 gint i;
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
145 gboolean isMeta;
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
146 xmlChar *findName;
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
147
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
148 if (!xmlStrcmp(nptr->name, (xmlChar *)"meta")) {
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
149 isMeta = TRUE;
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
150 findName = xmlGetProp(nptr, (xmlChar *)"rel");
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
151 } else {
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
152 isMeta = FALSE;
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
153 findName = xmlStrdup(nptr->name);
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
154 }
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
155
1669
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
156 for (i = 0; i < xspf_nentries; i++)
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
157 if ((xspf_entries[i].isMeta == isMeta) &&
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
158 !xmlStrcmp(findName, (xmlChar *)xspf_entries[i].xspfName)) {
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
159 xmlChar *str = xmlNodeGetContent(nptr);
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
160 switch (xspf_entries[i].type) {
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
161 case TUPLE_STRING:
1976
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1966
diff changeset
162 aud_tuple_associate_string(tuple, xspf_entries[i].tupleField, NULL, (gchar *)str);
1669
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
163 break;
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
164
1669
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
165 case TUPLE_INT:
2234
ef61e0c66000 xspf had not read mtime from some time.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2213
diff changeset
166 AUDDBG("field=%s val=%s\n", xspf_entries[i].xspfName, str);
1976
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1966
diff changeset
167 aud_tuple_associate_int(tuple, xspf_entries[i].tupleField, NULL, atol((char *)str));
1669
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
168 break;
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
169
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
170 default:
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
171 break;
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
172 }
1669
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
173 xmlFree(str);
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 }
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
176
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
177 xmlFree(findName);
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
178 }
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
179 }
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
180 }
47
85d7e55b29d2 [svn] - redundant metadata has been removed.
yaz
parents: 12
diff changeset
181
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
182 if (location) {
2243
58b89671b395 make use of aud_uri_to_display_*()
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2234
diff changeset
183 gchar *scratch = NULL;
1444
3b1651d37b58 xspf: update to new API
William Pitcock <nenolod@atheme-project.org>
parents: 1395
diff changeset
184
2166
9fa5a7884514 unescape uri before write into tuple.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2126
diff changeset
185 /* filename and path in tuple must be unescaped. */
2243
58b89671b395 make use of aud_uri_to_display_*()
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2234
diff changeset
186 scratch = aud_uri_to_display_basename(location);
1976
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1966
diff changeset
187 aud_tuple_associate_string(tuple, FIELD_FILE_NAME, NULL, scratch);
1444
3b1651d37b58 xspf: update to new API
William Pitcock <nenolod@atheme-project.org>
parents: 1395
diff changeset
188 g_free(scratch);
3b1651d37b58 xspf: update to new API
William Pitcock <nenolod@atheme-project.org>
parents: 1395
diff changeset
189
2243
58b89671b395 make use of aud_uri_to_display_*()
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2234
diff changeset
190 scratch = aud_uri_to_display_dirname(location);
1976
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1966
diff changeset
191 aud_tuple_associate_string(tuple, FIELD_FILE_PATH, NULL, scratch);
1444
3b1651d37b58 xspf: update to new API
William Pitcock <nenolod@atheme-project.org>
parents: 1395
diff changeset
192 g_free(scratch);
3b1651d37b58 xspf: update to new API
William Pitcock <nenolod@atheme-project.org>
parents: 1395
diff changeset
193
2243
58b89671b395 make use of aud_uri_to_display_*()
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2234
diff changeset
194 aud_tuple_associate_string(tuple, FIELD_FILE_EXT, NULL, strrchr(location, '.'));
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
195
2213
137187e7a379 make use of AUDDBG() for debug print out.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2170
diff changeset
196 AUDDBG("tuple->file_name = %s\n", aud_tuple_get_string(tuple, FIELD_FILE_NAME, NULL));
137187e7a379 make use of AUDDBG() for debug print out.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2170
diff changeset
197 AUDDBG("tuple->file_path = %s\n", aud_tuple_get_string(tuple, FIELD_FILE_PATH, NULL));
1963
b9b62802b072 Define a preprocessor macro XSDEBUG() for printing debugging messages, if DEBUG is defined.
Matti Hamalainen <ccr@tnsp.org>
parents: 1962
diff changeset
198
2166
9fa5a7884514 unescape uri before write into tuple.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2126
diff changeset
199 /* add file to playlist */
2170
02cfac0efbdc remove unnecessary code. (I can't recall why I used "uri", actually.)
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2169
diff changeset
200 aud_playlist_load_ins_file_tuple(playlist, location, filename, pos, 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
201 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
202 }
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
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
204 g_free(location);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
205 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
206
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
207
1962
076126300dd8 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 1952
diff changeset
208 static void xspf_find_track(xmlNode *tracklist, const gchar *filename,
076126300dd8 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 1952
diff changeset
209 gint pos, const gchar *base)
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
210 {
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
211 xmlNode *nptr;
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
212
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
213 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
214 if (nptr->type == XML_ELEMENT_NODE &&
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
215 !xmlStrcmp(nptr->name, (xmlChar *)"track")) {
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
216 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
217 }
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
218 }
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
219 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
220
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
221
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
222 static void xspf_find_audoptions(xmlNode *tracklist, const gchar *filename, gint pos)
641
3f0a3c24f2b9 [svn] libxspf improvements:
yaz
parents: 585
diff changeset
223 {
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
224 xmlNode *nptr;
2057
cf4fa45ffd80 playlist API vtabling
William Pitcock <nenolod@atheme.org>
parents: 2053
diff changeset
225 Playlist *playlist = aud_playlist_get_active();
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
226
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
227 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
228 if (nptr->type == XML_ELEMENT_NODE &&
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
229 !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
230 xmlChar *opt = NULL;
884
4fd90f2d1832 [svn] improve support for static playlist:
yaz
parents: 657
diff changeset
231
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
232 opt = xmlGetProp(nptr, (xmlChar *)"staticlist");
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
233 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
234 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
235 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
236 playlist->attribute ^= PLAYLIST_STATIC;
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
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 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
239 }
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 }
641
3f0a3c24f2b9 [svn] libxspf improvements:
yaz
parents: 585
diff changeset
241 }
3f0a3c24f2b9 [svn] libxspf improvements:
yaz
parents: 585
diff changeset
242
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
243
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
244 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
245 {
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
246 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
247 xmlNode *nptr, *nptr2;
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
248
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
249 g_return_if_fail(filename != NULL);
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
250
2213
137187e7a379 make use of AUDDBG() for debug print out.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2170
diff changeset
251 AUDDBG("filename='%s', pos=%d\n", filename, pos);
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
252
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
253 doc = xmlRecoverFile(filename);
1964
375950feec51 Cosmetic whitespace changes.
Matti Hamalainen <ccr@tnsp.org>
parents: 1963
diff changeset
254 if (doc == 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
255 return;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
256
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
257 // find trackList
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
258 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
259 if (nptr->type == XML_ELEMENT_NODE &&
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
260 !xmlStrcmp(nptr->name, (xmlChar *)"playlist")) {
1965
41d726acb915 Remove useless NULL assignations.
Matti Hamalainen <ccr@tnsp.org>
parents: 1964
diff changeset
261 gchar *tmp, *base;
41d726acb915 Remove useless NULL assignations.
Matti Hamalainen <ccr@tnsp.org>
parents: 1964
diff changeset
262
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
263 base = (gchar *)xmlNodeGetBase(doc, nptr);
1963
b9b62802b072 Define a preprocessor macro XSDEBUG() for printing debugging messages, if DEBUG is defined.
Matti Hamalainen <ccr@tnsp.org>
parents: 1962
diff changeset
264
2213
137187e7a379 make use of AUDDBG() for debug print out.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2170
diff changeset
265 AUDDBG("base = %s\n", base);
1963
b9b62802b072 Define a preprocessor macro XSDEBUG() for printing debugging messages, if DEBUG is defined.
Matti Hamalainen <ccr@tnsp.org>
parents: 1962
diff changeset
266
1278
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
267 // 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
268 tmp = xmlURIUnescapeString(base, -1, NULL);
1964
375950feec51 Cosmetic whitespace changes.
Matti Hamalainen <ccr@tnsp.org>
parents: 1963
diff changeset
269 if (tmp) {
375950feec51 Cosmetic whitespace changes.
Matti Hamalainen <ccr@tnsp.org>
parents: 1963
diff changeset
270 if (!strcmp(tmp, filename)) {
1278
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
271 xmlFree(base);
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
272 base = NULL;
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
273 }
1278
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
274 g_free(tmp);
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
275 }
1963
b9b62802b072 Define a preprocessor macro XSDEBUG() for printing debugging messages, if DEBUG is defined.
Matti Hamalainen <ccr@tnsp.org>
parents: 1962
diff changeset
276
2213
137187e7a379 make use of AUDDBG() for debug print out.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2170
diff changeset
277 AUDDBG("base = %s\n", base);
1963
b9b62802b072 Define a preprocessor macro XSDEBUG() for printing debugging messages, if DEBUG is defined.
Matti Hamalainen <ccr@tnsp.org>
parents: 1962
diff changeset
278
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
279 for (nptr2 = nptr->children; nptr2 != NULL; nptr2 = nptr2->next) {
641
3f0a3c24f2b9 [svn] libxspf improvements:
yaz
parents: 585
diff changeset
280
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
281 if (nptr2->type == XML_ELEMENT_NODE &&
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
282 !xmlStrcmp(nptr2->name, (xmlChar *)"extension")) {
641
3f0a3c24f2b9 [svn] libxspf improvements:
yaz
parents: 585
diff changeset
283 //check if application is audacious
3f0a3c24f2b9 [svn] libxspf improvements:
yaz
parents: 585
diff changeset
284 xmlChar *app = NULL;
3f0a3c24f2b9 [svn] libxspf improvements:
yaz
parents: 585
diff changeset
285 app = xmlGetProp(nptr2, (xmlChar *)"application");
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
286 if (!xmlStrcmp(app, (xmlChar *)"audacious"))
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
287 xspf_find_audoptions(nptr2, filename, pos);
641
3f0a3c24f2b9 [svn] libxspf improvements:
yaz
parents: 585
diff changeset
288 xmlFree(app);
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
289 } else
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 *)"title")) {
2057
cf4fa45ffd80 playlist API vtabling
William Pitcock <nenolod@atheme.org>
parents: 2053
diff changeset
292 Playlist *plist = aud_playlist_get_active();
1528
8fddba1d94e4 xspf: When loading playlist, read title from xml if set
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents: 1514
diff changeset
293 xmlChar *title = xmlNodeGetContent(nptr2);
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
294
1528
8fddba1d94e4 xspf: When loading playlist, read title from xml if set
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents: 1514
diff changeset
295 if (title && *title) {
2057
cf4fa45ffd80 playlist API vtabling
William Pitcock <nenolod@atheme.org>
parents: 2053
diff changeset
296 aud_playlist_set_current_name(plist, (gchar*)title);
1528
8fddba1d94e4 xspf: When loading playlist, read title from xml if set
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents: 1514
diff changeset
297 }
8fddba1d94e4 xspf: When loading playlist, read title from xml if set
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents: 1514
diff changeset
298 xmlFree(title);
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
299 } else
1964
375950feec51 Cosmetic whitespace changes.
Matti Hamalainen <ccr@tnsp.org>
parents: 1963
diff changeset
300 if (nptr2->type == XML_ELEMENT_NODE &&
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
301 !xmlStrcmp(nptr2->name, (xmlChar *)"trackList")) {
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
302 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
303 }
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
304 }
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
305 }
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
306 }
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
307 xmlFreeDoc(doc);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
308 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
309
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
310
1962
076126300dd8 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 1952
diff changeset
311 static void xspf_add_node(xmlNodePtr node, TupleValueType type,
076126300dd8 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 1952
diff changeset
312 gboolean isMeta, const gchar *xspfName, const gchar *strVal,
076126300dd8 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 1952
diff changeset
313 const gint intVal)
1668
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
314 {
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
315 gchar tmps[64];
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
316 xmlNodePtr tmp;
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
317
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
318 if (isMeta) {
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
319 tmp = xmlNewNode(NULL, (xmlChar *) "meta");
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
320 xmlSetProp(tmp, (xmlChar *) "rel", (xmlChar *) xspfName);
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
321 } else
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
322 tmp = xmlNewNode(NULL, (xmlChar *) xspfName);
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
323
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
324 switch (type) {
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
325 case TUPLE_STRING:
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
326 xmlAddChild(tmp, xmlNewText((xmlChar *) strVal));
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
327 break;
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 case TUPLE_INT:
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
330 g_snprintf(tmps, sizeof(tmps), "%d", intVal);
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
331 xmlAddChild(tmp, xmlNewText((xmlChar *) tmps));
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
332 break;
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
333
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
334 default:
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
335 break;
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
336 }
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
337
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
338 xmlAddChild(node, tmp);
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
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
341
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
342 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
343 {
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
344 xmlDocPtr doc;
1669
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
345 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
346 GList *node;
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
347 gint baselen = 0;
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
348 gchar *base = NULL;
2057
cf4fa45ffd80 playlist API vtabling
William Pitcock <nenolod@atheme.org>
parents: 2053
diff changeset
349 Playlist *playlist = aud_playlist_get_active();
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
350
2213
137187e7a379 make use of AUDDBG() for debug print out.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2170
diff changeset
351 AUDDBG("filename='%s', pos=%d\n", filename, pos);
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
352
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
353 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
354 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
355 doc->encoding = xmlStrdup((xmlChar *)"UTF-8");
585
2d20bc58a290 [svn] tweak xspf plugin to conform xspf specification version 1.
yaz
parents: 577
diff changeset
356
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 rootnode = xmlNewNode(NULL, (xmlChar *)XSPF_ROOT_NODE_NAME);
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
358 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
359 xmlSetProp(rootnode, (xmlChar *)"xmlns", (xmlChar *)XSPF_XMLNS);
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
360
1675
ae9b0327b620 Fix plugins to conform with PLAYLIST_{UN}LOCK() change.
Matti Hamalainen <ccr@tnsp.org>
parents: 1669
diff changeset
361 PLAYLIST_LOCK(playlist);
1278
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
362
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
363 /* relative */
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
364 if (playlist->attribute & PLAYLIST_USE_RELATIVE) {
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
365 /* prescan to determine base uri */
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
366 for (node = playlist->entries; node != NULL; node = g_list_next(node)) {
2455
50ae65a59351 patch by chrome
mf0102 <0102@gmx.at>
parents: 2243
diff changeset
367 gchar *ptr1, *ptr2, *ptrslash;
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
368 PlaylistEntry *entry = PLAYLIST_ENTRY(node->data);
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
369 gchar *tmp;
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
370 gint tmplen = 0;
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
371
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
372 if (!is_uri(entry->filename)) { //obsolete
1966
f85a079573c3 More slight cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 1965
diff changeset
373 gchar *tmp2 = g_path_get_dirname(entry->filename);
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
374 tmp = g_strdup_printf("%s/", tmp2);
1669
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
375 g_free(tmp2);
1966
f85a079573c3 More slight cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 1965
diff changeset
376 } else
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
377 tmp = g_strdup(entry->filename);
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
378
1964
375950feec51 Cosmetic whitespace changes.
Matti Hamalainen <ccr@tnsp.org>
parents: 1963
diff changeset
379 if (!base) {
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
380 base = strdup(tmp);
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
381 baselen = strlen(base);
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
382 }
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
383
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
384 ptr1 = base;
2455
50ae65a59351 patch by chrome
mf0102 <0102@gmx.at>
parents: 2243
diff changeset
385 ptrslash = ptr2 = tmp;
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
386
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
387 while(ptr1 && ptr2 && *ptr1 && *ptr2 && *ptr1 == *ptr2) {
2455
50ae65a59351 patch by chrome
mf0102 <0102@gmx.at>
parents: 2243
diff changeset
388 if (*ptr2 == '/') ptrslash = ptr2 + 1;
50ae65a59351 patch by chrome
mf0102 <0102@gmx.at>
parents: 2243
diff changeset
389
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
390 ptr1++;
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
391 ptr2++;
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
392 }
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
393
2455
50ae65a59351 patch by chrome
mf0102 <0102@gmx.at>
parents: 2243
diff changeset
394 if (!(*ptrslash)) ptrslash--;
50ae65a59351 patch by chrome
mf0102 <0102@gmx.at>
parents: 2243
diff changeset
395 *ptrslash = '\0'; //terminate
50ae65a59351 patch by chrome
mf0102 <0102@gmx.at>
parents: 2243
diff changeset
396 tmplen = ptrslash - tmp;
892
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 if (tmplen <= baselen) {
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
399 g_free(base);
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
400 base = tmp;
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
401 baselen = tmplen;
2213
137187e7a379 make use of AUDDBG() for debug print out.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2170
diff changeset
402 AUDDBG("base='%s', baselen=%d\n", base, baselen);
1966
f85a079573c3 More slight cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 1965
diff changeset
403 } else
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
404 g_free(tmp);
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 /* set base URI */
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
408 if (base) {
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
409 gchar *tmp;
1964
375950feec51 Cosmetic whitespace changes.
Matti Hamalainen <ccr@tnsp.org>
parents: 1963
diff changeset
410 if (!is_uri(base)) {
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
411 tmp = (gchar *) xspf_path_to_uri((xmlChar *)base);
1964
375950feec51 Cosmetic whitespace changes.
Matti Hamalainen <ccr@tnsp.org>
parents: 1963
diff changeset
412 if (tmp) {
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
413 g_free(base);
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
414 base = tmp;
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
415 }
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
416 }
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
417
1964
375950feec51 Cosmetic whitespace changes.
Matti Hamalainen <ccr@tnsp.org>
parents: 1963
diff changeset
418 if (!is_uri(base)) {
2213
137187e7a379 make use of AUDDBG() for debug print out.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2170
diff changeset
419 AUDDBG("base is not uri. something is wrong.\n");
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
420 tmp = g_strdup_printf("file://%s", base);
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
421 xmlSetProp(rootnode, (xmlChar *)"xml:base", (xmlChar *)tmp);
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
422 g_free(tmp);
1966
f85a079573c3 More slight cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 1965
diff changeset
423 } else
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
424 xmlSetProp(rootnode, (xmlChar *)"xml:base", (xmlChar *)base);
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
425 }
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
426 } /* USE_RELATIVE */
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
427
1278
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
428 /* 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
429 xmlDocSetRootElement(doc, rootnode);
1669
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
430 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
431
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
432 /* add staticlist marker */
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
433 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
434 xmlNodePtr extension, options;
884
4fd90f2d1832 [svn] improve support for static playlist:
yaz
parents: 657
diff changeset
435
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
436 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
437 xmlSetProp(extension, (xmlChar *)"application", (xmlChar *)"audacious");
884
4fd90f2d1832 [svn] improve support for static playlist:
yaz
parents: 657
diff changeset
438
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
439 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
440 xmlSetProp(options, (xmlChar *)"staticlist", (xmlChar *)"true");
884
4fd90f2d1832 [svn] improve support for static playlist:
yaz
parents: 657
diff changeset
441
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
442 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
443 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
444 }
884
4fd90f2d1832 [svn] improve support for static playlist:
yaz
parents: 657
diff changeset
445
1531
10cfa5b51bce xspf: Store playlist title when saving playlist
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents: 1528
diff changeset
446 /* save playlist title */
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
447 if (playlist->title && playlist->title[0] &&
1669
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
448 g_utf8_validate(playlist->title, -1, NULL))
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
449 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
450
1531
10cfa5b51bce xspf: Store playlist title when saving playlist
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents: 1528
diff changeset
451
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
452 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
453 xmlAddChild(rootnode, tracklist);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
454
1964
375950feec51 Cosmetic whitespace changes.
Matti Hamalainen <ccr@tnsp.org>
parents: 1963
diff changeset
455 for (node = playlist->entries; node != NULL; node = g_list_next(node)) {
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
456 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
457 xmlNodePtr track, location;
1668
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
458 gchar *filename = NULL;
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
459 const gchar *scratch = NULL;
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
460 gint scratchi = 0;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
461
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
462 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
463 location = xmlNewNode(NULL, (xmlChar *)"location");
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
464
1964
375950feec51 Cosmetic whitespace changes.
Matti Hamalainen <ccr@tnsp.org>
parents: 1963
diff changeset
465 if (is_uri(entry->filename)) { /* uri */
2213
137187e7a379 make use of AUDDBG() for debug print out.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2170
diff changeset
466 AUDDBG("filename is uri\n");
1278
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
467 filename = g_strdup(entry->filename + baselen); // entry->filename is always uri now.
1966
f85a079573c3 More slight cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 1965
diff changeset
468 } else { /* local file (obsolete) */
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
469 gchar *tmp = (gchar *) xspf_path_to_uri((const xmlChar *)entry->filename + baselen);
1964
375950feec51 Cosmetic whitespace changes.
Matti Hamalainen <ccr@tnsp.org>
parents: 1963
diff changeset
470 if (base) { /* relative */
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
471 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
472 } else {
2213
137187e7a379 make use of AUDDBG() for debug print out.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2170
diff changeset
473 AUDDBG("absolute and local (obsolete)\n");
1278
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
474 filename = g_filename_to_uri(tmp, NULL, NULL);
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
475 }
1965
41d726acb915 Remove useless NULL assignations.
Matti Hamalainen <ccr@tnsp.org>
parents: 1964
diff changeset
476 g_free(tmp);
1278
d1c66f8ccf73 adapt xspf for file:// scheme.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1271
diff changeset
477 } /* obsolete */
585
2d20bc58a290 [svn] tweak xspf plugin to conform xspf specification version 1.
yaz
parents: 577
diff changeset
478
1964
375950feec51 Cosmetic whitespace changes.
Matti Hamalainen <ccr@tnsp.org>
parents: 1963
diff changeset
479 if (!g_utf8_validate(filename, -1, 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
480 continue;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
481
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
482 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
483 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
484 xmlAddChild(tracklist, track);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
485
1669
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
486 /* Do we have a tuple? */
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
487 if (entry->tuple != NULL) {
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
488 gint i;
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
489 for (i = 0; i < xspf_nentries; i++) {
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
490 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
491 gboolean isOK = FALSE;
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
492
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
493 switch (xs->type) {
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
494 case TUPLE_STRING:
1976
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1966
diff changeset
495 scratch = aud_tuple_get_string(entry->tuple, xs->tupleField, NULL);
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
496 switch (xs->compare) {
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
497 case CMP_DEF: isOK = (scratch != NULL); break;
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
498 case CMP_NULL: isOK = (scratch == NULL); break;
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
499 }
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
500 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
501 isOK = FALSE;
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
502 break;
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
503
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
504 case TUPLE_INT:
1976
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1966
diff changeset
505 scratchi = aud_tuple_get_int(entry->tuple, xs->tupleField, NULL);
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
506 switch (xs->compare) {
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
507 case CMP_DEF: isOK = (scratchi != 0); break;
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
508 case CMP_GT: isOK = (scratchi > 0); break;
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
509 }
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
510 break;
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
511
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
512 default:
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
513 break;
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
514 }
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
515
1668
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
516 if (isOK)
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
517 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
518 }
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
519
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
520 } else {
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
521
1668
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
522 if (entry->title != NULL && g_utf8_validate(entry->title, -1, NULL))
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
523 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
524
1668
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
525 if (entry->length > 0)
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
526 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
527
1669
e1985da23d28 And yet more cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1668
diff changeset
528 /* Add mtime of -1 */
1668
4c088a45f839 More code cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1667
diff changeset
529 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
530 }
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
531
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
532 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
533 }
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
534
1675
ae9b0327b620 Fix plugins to conform with PLAYLIST_{UN}LOCK() change.
Matti Hamalainen <ccr@tnsp.org>
parents: 1669
diff changeset
535 PLAYLIST_UNLOCK(playlist);
92
fadf346ddde3 [svn] - pls doesn't go along with PLAYLIST_LOCK in playlist_save().
yaz
parents: 87
diff changeset
536
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
537 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
538 xmlFreeDoc(doc);
892
d0b558bcf704 [svn] - initial support for writing relative path.
yaz
parents: 891
diff changeset
539 xmlFree(base);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
540 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
541
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
542
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
543 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
544 .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
545 .ext = "xspf",
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
546 .plc_read = xspf_playlist_load,
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
547 .plc_write = xspf_playlist_save,
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
548 };
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
549
1962
076126300dd8 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 1952
diff changeset
550
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
551 static void xspf_init(void)
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
552 {
2053
059bd21a0c80 PlaylistContainer API updates
William Pitcock <nenolod@atheme.org>
parents: 1976
diff changeset
553 aud_playlist_container_register(&plc_xspf);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
554 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
555
1962
076126300dd8 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 1952
diff changeset
556
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
557 static void xspf_cleanup(void)
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
558 {
2053
059bd21a0c80 PlaylistContainer API updates
William Pitcock <nenolod@atheme.org>
parents: 1976
diff changeset
559 aud_playlist_container_unregister(&plc_xspf);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
560 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
561
1962
076126300dd8 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 1952
diff changeset
562
1661
927d341eecb8 Partial rewrite/sanitation of the xspf plugin.
Matti Hamalainen <ccr@tnsp.org>
parents: 1594
diff changeset
563 DECLARE_PLUGIN(xspf, xspf_init, xspf_cleanup, NULL, NULL, NULL, NULL, NULL, NULL);