|
Removed
Link Here
|
| 1 |
--- configure.orig 2008-10-14 16:20:58 UTC |
| 2 |
+++ configure |
| 3 |
@@ -288,7 +288,7 @@ fi |
| 4 |
if [ "$CFG_XSPF" != "" ] |
| 5 |
then |
| 6 |
CFLAGS="$CFLAGS -DBUILD_XSPF" |
| 7 |
- LDFLAGS="$LDFLAGS -lspiff" |
| 8 |
+ test_pkgconfig "libxspf" "xspf" "_vfs_xspf" |
| 9 |
SRCS="$SRCS util vfs_xspf" |
| 10 |
PLAYQ_DUMPFILE="autosave.xspf" |
| 11 |
else |
| 12 |
--- src/conftest.c.orig 2008-10-14 16:20:58 UTC |
| 13 |
+++ src/conftest.c |
| 14 |
@@ -56,16 +56,10 @@ |
| 15 |
#include <vorbis/codec.h> |
| 16 |
#include <vorbis/vorbisfile.h> |
| 17 |
#endif /* BUILD_VORBIS */ |
| 18 |
-#ifdef BUILD_XSPF |
| 19 |
-#include <spiff/spiff_c.h> |
| 20 |
-#endif /* BUILD_XSPF */ |
| 21 |
|
| 22 |
int |
| 23 |
main(int argc, char *argv[]) |
| 24 |
{ |
| 25 |
-#ifdef BUILD_XSPF |
| 26 |
- spiff_write(NULL, NULL, NULL); |
| 27 |
-#endif /* BUILD_XSPF */ |
| 28 |
|
| 29 |
return (0); |
| 30 |
} |
| 31 |
--- src/vfs_xspf.c.orig 2008-10-14 16:20:58 UTC |
| 32 |
+++ src/vfs_xspf.c |
| 33 |
@@ -30,7 +30,7 @@ |
| 34 |
|
| 35 |
#include "stdinc.h" |
| 36 |
|
| 37 |
-#include <spiff/spiff_c.h> |
| 38 |
+#include <xspf_c.h> |
| 39 |
|
| 40 |
#include "util.h" |
| 41 |
#include "vfs.h" |
| 42 |
@@ -50,22 +50,22 @@ vfs_xspf_match(struct vfsent *ve, int is |
| 43 |
int |
| 44 |
vfs_xspf_populate(struct vfsent *ve) |
| 45 |
{ |
| 46 |
- struct spiff_list *slist; |
| 47 |
- struct spiff_track *strack; |
| 48 |
- struct spiff_mvalue *sloc; |
| 49 |
+ struct xspf_list *slist; |
| 50 |
+ struct xspf_track *strack; |
| 51 |
+ struct xspf_mvalue *sloc; |
| 52 |
char *dirname, *baseuri, *filename; |
| 53 |
struct vfsref *vr; |
| 54 |
|
| 55 |
baseuri = url_escape(ve->filename); |
| 56 |
- slist = spiff_parse(ve->filename, baseuri); |
| 57 |
+ slist = xspf_parse(ve->filename, baseuri); |
| 58 |
g_free(baseuri); |
| 59 |
if (slist == NULL) |
| 60 |
return (-1); |
| 61 |
|
| 62 |
dirname = g_path_get_dirname(ve->filename); |
| 63 |
|
| 64 |
- SPIFF_LIST_FOREACH_TRACK(slist, strack) { |
| 65 |
- SPIFF_TRACK_FOREACH_LOCATION(strack, sloc) { |
| 66 |
+ XSPF_LIST_FOREACH_TRACK(slist, strack) { |
| 67 |
+ XSPF_TRACK_FOREACH_LOCATION(strack, sloc) { |
| 68 |
/* Skip file:// part */ |
| 69 |
filename = url_unescape(sloc->value); |
| 70 |
|
| 71 |
@@ -77,40 +77,40 @@ vfs_xspf_populate(struct vfsent *ve) |
| 72 |
} |
| 73 |
|
| 74 |
g_free(dirname); |
| 75 |
- spiff_free(slist); |
| 76 |
+ xspf_free(slist); |
| 77 |
return (0); |
| 78 |
} |
| 79 |
|
| 80 |
int |
| 81 |
vfs_xspf_write(const struct vfslist *vl, const char *filename) |
| 82 |
{ |
| 83 |
- struct spiff_list *list; |
| 84 |
- struct spiff_track *track; |
| 85 |
- struct spiff_mvalue *location; |
| 86 |
+ struct xspf_list *list; |
| 87 |
+ struct xspf_track *track; |
| 88 |
+ struct xspf_mvalue *location; |
| 89 |
char *fn, *baseuri; |
| 90 |
struct vfsref *vr; |
| 91 |
int ret; |
| 92 |
|
| 93 |
- list = spiff_new(); |
| 94 |
+ list = xspf_new(); |
| 95 |
|
| 96 |
VFS_LIST_FOREACH_REVERSE(vl, vr) { |
| 97 |
/* Add a new track to the beginning of the list */ |
| 98 |
- track = spiff_new_track_before(&list->tracks); |
| 99 |
+ track = xspf_new_track_before(&list->tracks); |
| 100 |
|
| 101 |
/* Make sure we don't write non-UTF-8 titles to disk */ |
| 102 |
if (g_utf8_validate(vfs_name(vr), -1, NULL)) |
| 103 |
- spiff_setvalue(&track->title, vfs_name(vr)); |
| 104 |
+ xspf_setvalue(&track->title, vfs_name(vr)); |
| 105 |
|
| 106 |
- location = spiff_new_mvalue_before(&track->locations); |
| 107 |
+ location = xspf_new_mvalue_before(&track->locations); |
| 108 |
fn = url_escape(vfs_filename(vr)); |
| 109 |
- spiff_setvalue(&location->value, fn); |
| 110 |
+ xspf_setvalue(&location->value, fn); |
| 111 |
g_free(fn); |
| 112 |
} |
| 113 |
|
| 114 |
baseuri = url_escape(filename); |
| 115 |
- ret = spiff_write(list, filename, baseuri); |
| 116 |
+ ret = xspf_write(list, filename, baseuri); |
| 117 |
g_free(baseuri); |
| 118 |
- spiff_free(list); |
| 119 |
+ xspf_free(list); |
| 120 |
|
| 121 |
return (ret); |
| 122 |
} |