libspiff-commits Mailing List for libxspf: XSPF playlist handling library
Brought to you by:
hartwork
Menu
▾
▴
libspiff-commits — Mailing list serving libSpiff commit logs w/ diffs
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(6) |
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
|
Feb
(12) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <har...@us...> - 2009-03-10 20:34:08
|
Revision: 525
http://libspiff.svn.sourceforge.net/libspiff/?rev=525&view=rev
Author: hartwork
Date: 2009-03-10 20:33:28 +0000 (Tue, 10 Mar 2009)
Log Message:
-----------
Update some port links and logo destination
Modified Paths:
--------------
website/index.html
Modified: website/index.html
===================================================================
--- website/index.html 2009-03-04 16:35:56 UTC (rev 524)
+++ website/index.html 2009-03-10 20:33:28 UTC (rev 525)
@@ -65,7 +65,7 @@
<p>
You can <a href="http://sourceforge.net/project/showfiles.php?group_id=176018">download</a>
libxspf from the "Files" section on
- <a href="http://sourceforge.net/projects/libspiff/" target="_blank">libxspf's project page</a>
+ <a href="http://sourceforge.net/projects/libspiff" target="_blank">libxspf's project page</a>
at SourceForge. Additionally you can
<a href="http://git.xiph.org/?p=libxspf.git;a=summary">browse</a> the Git repository.
</p>
@@ -84,20 +84,20 @@
<h2><a name="ports">Ports</a></h2>
<ul>
- <li><a href="http://sisyphus.ru/srpm/libspiff" target="_blank">ALT Linux</a> (Vitaly Lipatov)</li>
- <li><a href="http://aur.archlinux.org/packages.php?do_Details=1&ID=11622" target="_blank">Arch Linux</a> (Juan Pablo González Tognarelli)</li>
+ <li><a href="http://sisyphus.ru/srpm/libxspf" target="_blank">ALT Linux</a> (Vitaly Lipatov)</li>
+ <li><a href="http://aur.archlinux.org/packages.php?ID=24140" target="_blank">Arch Linux</a> (Juan Pablo González Tognarelli)</li>
<li><a href="http://packages.debian.org/sid/libspiff1" target="_blank">Debian</a> (Adeodato Simó)</li>
<li><a href="http://pkgbox.dragonflybsd.org/packages/DragonFly-2.0/pkgsrc-2008Q2/audio/" target="_blank">DragonFly BSD</a></li>
- <li><a href="http://www.freebsd.org/cgi/cvsweb.cgi/ports/multimedia/libspiff/" target="_blank">FreeBSD</a> (Ed Schouten)</li>
+ <li><a href="http://www.freebsd.org/cgi/cvsweb.cgi/ports/multimedia/libxspf/" target="_blank">FreeBSD</a> (Ed Schouten)</li>
<li><a href="http://packages.gentoo.org/package/media-libs/libspiff" target="_blank">Gentoo Linux</a> (Robert Buchholz)</li>
<li><a href="https://src.timesys.com/svn/published/factory/builder/target/software/Multimedia/libspiff/" target="_blank">LinuxLink</a></li>
- <li><a href="http://trac.macports.org/projects/macports/browser/trunk/dports/devel/libspiff" target="_blank">MacPorts</a> (Ed Schouten)</li>
- <li><a href="http://dev.openbossa.org/trac/mamona/browser/packages/libspiff" target="_blank">Mamona</a> (Dr. Michael Lauer)</li>
+ <li><a href="http://trac.macports.org/browser/trunk/dports/devel/libspiff" target="_blank">MacPorts</a> (Ed Schouten)</li>
+ <li><a href="http://dev.openbossa.org/mamona/gitweb?p=mamona.git;a=tree;f=packages/libspiff;hb=HEAD" target="_blank">Mamona</a> (Dr. Michael Lauer)</li>
<li><a href="http://pkgsrc.se/audio/libspiff" target="_blank">NetBSD</a> (Blair Sadewitz)</li>
- <li><a href="http://www.openembedded.org/filebrowser/org.openembedded.dev/packages/libspiff" target="_blank">OpenEmbedded</a> (Dr. Michael Lauer)</li>
+ <li><a href="http://cgit.openembedded.net/cgit.cgi?url=openembedded/tree/packages/libspiff" target="_blank">OpenEmbedded</a> (Dr. Michael Lauer)</li>
<li><a href="http://packages.pardus.org.tr/contrib/source/libspiff.html" target="_blank">Pardus Linux</a> (Eren Türkay)</li>
<li><a href="http://svn.gna.org/viewcvs/pingwinek/trunk/packages/libspiff/" target="_blank">Pingwinek GNU/Haiku</a> (Grzegorz Dąbrowski)</li>
- <li><a href="http://cvs.pld-linux.org/cgi-bin/cvsweb/SPECS/libspiff.spec?rev=" target="_blank">PLD Linux</a> (Arkadiusz Miskiewicz)</li>
+ <li><a href="http://cvs.pld-linux.org/cgi-bin/cvsweb/SPECS/libxspf.spec?rev=" target="_blank">PLD Linux</a> (Arkadiusz Miskiewicz)</li>
<li><a href="http://repository.slacky.eu/slackware-12.0/libraries/libspiff" target="_blank">Slackware</a> (Michelino Chionchio)</li>
<li><a href="http://software.opensuse.org/search?q=libspiff" target="_blank">SUSE Linux</a> (Cristian Rodriguez)</li>
<li><a href="http://www.t2-project.org/packages/libspiff.html" target="_blank">T2 SDE</a> (Rene Rebe)</li>
@@ -120,9 +120,9 @@
<h2><a name="links">Links</a></h2>
<ul>
- <li><a href="http://sourceforge.net/projects/libspiff/" target="_blank">libxspf project page</a></li>
+ <li><a href="http://sourceforge.net/projects/libspiff" target="_blank">libxspf SF.net project page</a></li>
<li><a href="http://freshmeat.net/projects/libxspf/" target="_blank">libxspf FreshMeat.net page</a></li>
- <li><a href="http://www.koders.com/info.aspx?c=ProjectInfo&pid=BTMRKQCFUU1U33GML3RRNZG75A" target="_blank">libSpiff Koders.com page</a></li>
+ <li><a href="http://www.ohloh.net/p/libxspf" target="_blank">libxspf Ohloh.net page</a></li>
<li><a href="http://www.xspf.org/specs/" target="_blank">Official XSPF specification</a></li>
<li><a href="http://wiki.xiph.org/index.php/XSPF_v1_Notes_and_Errata" target="_blank">XSPF v1 Notes and Errata</a></li>
<li><a href="http://lists.musicbrainz.org/mailman/listinfo/playlist" target="_blank">XSPF mailing list</a></li>
@@ -136,6 +136,6 @@
<a href="http://www.opensource.org/docs/definition.php" target="_blank"><img src="osi_certified_border_83_62.png" width="83" height="62" border="0" alt="OSI Certified Logo"></a>
- <a href="http://sourceforge.net/" target="_blank"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=176018&type=5" width="210" height="62" border="0" alt="SourceForge.net Logo"></a>
+ <a href="http://sourceforge.net/projects/libspiff" target="_blank"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=176018&type=5" width="210" height="62" border="0" alt="SourceForge.net Logo"></a>
</body>
</html>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <har...@us...> - 2009-03-04 16:36:05
|
Revision: 524
http://libspiff.svn.sourceforge.net/libspiff/?rev=524&view=rev
Author: hartwork
Date: 2009-03-04 16:35:56 +0000 (Wed, 04 Mar 2009)
Log Message:
-----------
Update FreshMeat link
Modified Paths:
--------------
website/index.html
Modified: website/index.html
===================================================================
--- website/index.html 2009-02-22 00:16:30 UTC (rev 523)
+++ website/index.html 2009-03-04 16:35:56 UTC (rev 524)
@@ -121,7 +121,7 @@
<h2><a name="links">Links</a></h2>
<ul>
<li><a href="http://sourceforge.net/projects/libspiff/" target="_blank">libxspf project page</a></li>
- <li><a href="http://freshmeat.net/projects/libspiff/" target="_blank">libSpiff FreshMeat.net page</a></li>
+ <li><a href="http://freshmeat.net/projects/libxspf/" target="_blank">libxspf FreshMeat.net page</a></li>
<li><a href="http://www.koders.com/info.aspx?c=ProjectInfo&pid=BTMRKQCFUU1U33GML3RRNZG75A" target="_blank">libSpiff Koders.com page</a></li>
<li><a href="http://www.xspf.org/specs/" target="_blank">Official XSPF specification</a></li>
<li><a href="http://wiki.xiph.org/index.php/XSPF_v1_Notes_and_Errata" target="_blank">XSPF v1 Notes and Errata</a></li>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <har...@us...> - 2009-02-22 00:16:35
|
Revision: 523
http://libspiff.svn.sourceforge.net/libspiff/?rev=523&view=rev
Author: hartwork
Date: 2009-02-22 00:16:30 +0000 (Sun, 22 Feb 2009)
Log Message:
-----------
Rename libSpiff to libxspf
Modified Paths:
--------------
website/index.html
Modified: website/index.html
===================================================================
--- website/index.html 2009-02-21 21:29:12 UTC (rev 522)
+++ website/index.html 2009-02-22 00:16:30 UTC (rev 523)
@@ -3,7 +3,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
- <title>libSpiff - XSPF playlist handling library</title>
+ <title>libxspf - XSPF playlist handling library</title>
<style type="text/css">
body {
font-family:"Bitstream Vera Sans", "Verdana";
@@ -17,7 +17,7 @@
</style>
</head>
<body>
- <h1>libSpiff</h1>
+ <h1>libxspf</h1>
<h2>Content</h2>
<ul>
@@ -33,11 +33,11 @@
<h2><a name="about">About</a></h2>
<p>
- libSpiff brings XSPF playlist reading and writing support to your C++ application.
- Both version 0 and 1 are supported. libSpiff uses <a href="http://expat.sourceforge.net/" target="_blank">Expat</a> for XML parsing,
+ libxspf (formerly called libSpiff) brings XSPF playlist reading and writing support to your C++ application.
+ Both version 0 and 1 are supported. libxspf uses <a href="http://expat.sourceforge.net/" target="_blank">Expat</a> for XML parsing,
<a href="http://cpptest.sourceforge.net/" target="_blank">CppTest</a> for unit testing
and <a href="http://uriparser.sourceforge.net/" target="_blank">uriparser</a> for handling URIs.
- libSpiff is the official reference implementation for XSPF of the
+ libxspf is the official reference implementation for XSPF of the
<a href="http://www.xiph.org/" target="_blank">Xiph.Org Foundation</a>.
</p>
@@ -52,7 +52,7 @@
<li>Full support for XML namespaces</li>
<li>Fast (as XML parsing is done by <a href="http://expat.sourceforge.net/" target="_blank">Expat</a>)</li>
<li>Extensive unit testing using <a href="http://cpptest.sourceforge.net/" target="_blank">CppTest</a></li>
- <li>Liberal license (<a href="http://libspiff.svn.sourceforge.net/viewvc/*checkout*/libspiff/trunk/COPYING" target="_blank">New BSD license</a>)</li>
+ <li>Liberal license (<a href="http://git.xiph.org/?p=libxspf.git;a=blob;f=COPYING;hb=HEAD" target="_blank">New BSD license</a>)</li>
</ul>
<h2><a name="dependencies">Dependencies</a></h2>
@@ -64,9 +64,10 @@
<h2><a name="download">Download</a></h2>
<p>
You can <a href="http://sourceforge.net/project/showfiles.php?group_id=176018">download</a>
- libSpiff from the "Files" section on libSpiff's project page at SourceForge. Additionally
- you can <a href="http://libspiff.svn.sourceforge.net/viewvc/libspiff/trunk/">browse</a> the Subversion
- repository.
+ libxspf from the "Files" section on
+ <a href="http://sourceforge.net/projects/libspiff/" target="_blank">libxspf's project page</a>
+ at SourceForge. Additionally you can
+ <a href="http://git.xiph.org/?p=libxspf.git;a=summary">browse</a> the Git repository.
</p>
<h2><a name="doc">Documentation</a></h2>
@@ -74,8 +75,8 @@
The API Documentation is split into language parts:
</p>
<ul>
- <li><a href="doc/html/">libSpiff</a> (C++)</li>
- <li><a href="spiff_c_doc/html/">spiff_c</a> (C)</li>
+ <li><a href="doc/html/">libxspf</a> (C++)</li>
+ <li><a href="xspf_c_doc/html/">xspf_c</a> (C)</li>
</ul>
<p>
The documentation was created with <a href="http://www.stack.nl/~dimitri/doxygen/" target="_blank">Doxygen</a>.
@@ -119,7 +120,7 @@
<h2><a name="links">Links</a></h2>
<ul>
- <li><a href="http://sourceforge.net/projects/libspiff/" target="_blank">libSpiff project page</a></li>
+ <li><a href="http://sourceforge.net/projects/libspiff/" target="_blank">libxspf project page</a></li>
<li><a href="http://freshmeat.net/projects/libspiff/" target="_blank">libSpiff FreshMeat.net page</a></li>
<li><a href="http://www.koders.com/info.aspx?c=ProjectInfo&pid=BTMRKQCFUU1U33GML3RRNZG75A" target="_blank">libSpiff Koders.com page</a></li>
<li><a href="http://www.xspf.org/specs/" target="_blank">Official XSPF specification</a></li>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <har...@us...> - 2009-02-21 21:29:16
|
Revision: 522
http://libspiff.svn.sourceforge.net/libspiff/?rev=522&view=rev
Author: hartwork
Date: 2009-02-21 21:29:12 +0000 (Sat, 21 Feb 2009)
Log Message:
-----------
Remove code, add moval notice file
Added Paths:
-----------
REPOSITORY_HAS_MOVED.txt
Removed Paths:
-------------
branches/
tags/
trunk/
Added: REPOSITORY_HAS_MOVED.txt
===================================================================
--- REPOSITORY_HAS_MOVED.txt (rev 0)
+++ REPOSITORY_HAS_MOVED.txt 2009-02-21 21:29:12 UTC (rev 522)
@@ -0,0 +1,10 @@
+- libSpiff has been *renamed* to libxspf. Code and people
+ have stayed the same.
+
+- libxspf has moved to *Git*. The repository is over here:
+ http://git.xiph.org/?p=libxspf.git;a=summary
+
+- Git works well with *Windows*, please check out msysgit:
+ http://code.google.com/p/msysgit/
+
+Thanks for your attention.
Property changes on: REPOSITORY_HAS_MOVED.txt
___________________________________________________________________
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <har...@us...> - 2009-02-18 03:23:14
|
Revision: 520
http://libspiff.svn.sourceforge.net/libspiff/?rev=520&view=rev
Author: hartwork
Date: 2009-02-18 01:31:04 +0000 (Wed, 18 Feb 2009)
Log Message:
-----------
svn:ignore stuff
Property Changed:
----------------
trunk/bindings/c/doc/
trunk/doc/
trunk/examples/check/
trunk/examples/strip/
Property changes on: trunk/bindings/c/doc
___________________________________________________________________
Modified: svn:ignore
- autom4te.cache
html
aclocal.m4
confcache
config.log
config.status
configure
*.exe
Makefile
Makefile.in
*.chm
*.qch
*.zip
+ autom4te.cache
html
aclocal.m4
confcache
config.log
config.status
configure
Doxyfile
*.exe
Makefile
Makefile.in
*.chm
*.qch
*.zip
release.sh
Property changes on: trunk/doc
___________________________________________________________________
Modified: svn:ignore
-
autom4te.cache
html
aclocal.m4
config.status
config.log
configure
*.exe
Makefile
Makefile.in
*.chm
*.qch
*.zip
+
autom4te.cache
html
aclocal.m4
config.status
config.log
configure
Doxyfile
*.exe
Makefile
Makefile.in
*.chm
*.qch
*.zip
release.sh
Property changes on: trunk/examples/check
___________________________________________________________________
Modified: svn:ignore
- .deps
.libs
.dirstamp
spiff_check.exe
spiff_check
+ .deps
.libs
.dirstamp
xspf_check.exe
xspf_check
Property changes on: trunk/examples/strip
___________________________________________________________________
Modified: svn:ignore
- .deps
.libs
.dirstamp
spiff_strip.exe
spiff_strip
+ .deps
.libs
.dirstamp
xspf_strip.exe
xspf_strip
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <har...@us...> - 2009-02-18 02:53:06
|
Revision: 521
http://libspiff.svn.sourceforge.net/libspiff/?rev=521&view=rev
Author: hartwork
Date: 2009-02-18 02:19:28 +0000 (Wed, 18 Feb 2009)
Log Message:
-----------
Script fixes, changelog order
Modified Paths:
--------------
trunk/ChangeLog
trunk/scripts/edit_version.sh
trunk/scripts/fix_svn_props.sh
trunk/scripts/release.sh
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-02-18 01:31:04 UTC (rev 520)
+++ trunk/ChangeLog 2009-02-18 02:19:28 UTC (rev 521)
@@ -1,25 +1,25 @@
???
* Changed: Rename from libSpiff to libxspf
- * Fixed: Compile errors with GCC 4.4
- Thanks to Martin Michlmayr for the patch!
- * Fixed: Compile errors with Sun Ceres C++ 5.10
- Thanks to Tim Mooney for the patch!
- Also, http://predef.sf.net/ was helpful again.
- * Fixed: Test suite compile fix for GCC 4.3
- Thanks to Alexis Ballier for the patch!
* Changed: Build system changes:
- configure option --enable-doc added
- configure.in renamed to configure.ac
- some Autotools files moved to build-aux directory
* Added: Qt Assistant documentation output:
- Qt Compressed Help (.qch) at
- * doc/libspiff-doc-*.qch
- * bindings/c/doc/spiff_c-doc-*.qch
+ * doc/libxspf-doc-*.qch
+ * bindings/c/doc/xspf_c-doc-*.qch
- Qt Help Project (.qhp) at
* doc/html/index.qhp
* bindings/c/doc/html/index.qhp
Generation requires Doxygen 1.5.7.1-20081103 or later.
+ * Fixed: Compile errors with GCC 4.4
+ Thanks to Martin Michlmayr for the patch!
+ * Fixed: Compile errors with Sun Ceres C++ 5.10
+ Thanks to Tim Mooney for the patch!
+ Also, http://predef.sf.net/ was helpful again.
+ * Fixed: Test suite compile fix for GCC 4.3
+ Thanks to Alexis Ballier for the patch!
* Improved: Nested configure hacks resolved
* Soname: 4:1:0
@@ -55,7 +55,7 @@
* Changed: SpiffReaderCallback::notifyStop() replaced
by SpiffReaderCallback::notifySuccess()
* Fixed: spiff_c compile fix for GCC 4.3
- Thanks to Ren\xE9 Rebe for the patch!
+ Thanks to Ren� Rebe for the patch!
* Added: Warnings for keys ("rel" attribute of <meta> and
<link> elements) that ..
- are not absolute URIs
@@ -149,7 +149,7 @@
2007-10-10 -- 0.8.2
* Fixed: Whitespace test case file missing in release archives
- Thanks to Adeodato Sim\xF3 for reporting this!
+ Thanks to Adeodato Sim� for reporting this!
* Fixed: 'make distcheck' now used and working
* Soname: 1:2:0
@@ -161,7 +161,7 @@
2007-09-17 -- 0.8.0
* Fixed: Bug in stealX() functions resulting in double frees
- Thanks to Eren T\xFCrkay, Robert Buchholz, and Ed Schouten!
+ Thanks to Eren T�rkay, Robert Buchholz, and Ed Schouten!
* Fixed: Win32 people now get the latest Expat and uriparser
(Expat 2.0.1, uriparser 0.5.2)
* Fixed: Proper soname updates from now on, starting at 1:0:0
@@ -180,7 +180,7 @@
* Fixed: Bug in SpiffXmlFormatter::writeStart
* Fixed: Visibility bug in SpiffChunkCallback
- Thanks to Szabolcs Horv\xE1t for reporting these two bugs!
+ Thanks to Szabolcs Horv�t for reporting these two bugs!
2007-06-04 -- 0.7.1
Modified: trunk/scripts/edit_version.sh
===================================================================
--- trunk/scripts/edit_version.sh 2009-02-18 01:31:04 UTC (rev 520)
+++ trunk/scripts/edit_version.sh 2009-02-18 02:19:28 UTC (rev 521)
@@ -1,8 +1,7 @@
#! /usr/bin/env bash
-PWD_BACKUP=${PWD}
SCRIPT_DIR=`dirname "${PWD}/$0"`
+(
cd "${SCRIPT_DIR}/.." || exit 1
-function fail() { cd "${PWD_BACKUP}" ; exit 1; }
####################################################################
kate \
@@ -15,5 +14,5 @@
&
####################################################################
-cd "${PWD_BACKUP}" || fail
+)
exit 0
Modified: trunk/scripts/fix_svn_props.sh
===================================================================
--- trunk/scripts/fix_svn_props.sh 2009-02-18 01:31:04 UTC (rev 520)
+++ trunk/scripts/fix_svn_props.sh 2009-02-18 02:19:28 UTC (rev 521)
@@ -1,10 +1,9 @@
#! /usr/bin/env bash
-PWD_BACKUP=${PWD}
SCRIPT_DIR=`dirname "${PWD}/$0"`
+(
cd "${SCRIPT_DIR}/.." || exit 1
-function fail() { cd "${PWD_BACKUP}" ; exit 1; }
-####################################################################
+
## Apply native EOL style
find . -name '.svn' -prune -o \( \
-name '*.cpp' \
@@ -46,8 +45,8 @@
## Make scripts executable
-find . -name '.svn' -prune -o \( -name '*.sh' \) -exec svn propset svn:executable '*' {} \;
+find . -name '.svn' -prune -o \( -name '*.sh' \) \
+ -exec svn propset svn:executable '*' {} \;
-####################################################################
-cd "${PWD_BACKUP}" || fail
-exit 0
+)
+exit $?
Modified: trunk/scripts/release.sh
===================================================================
--- trunk/scripts/release.sh 2009-02-18 01:31:04 UTC (rev 520)
+++ trunk/scripts/release.sh 2009-02-18 02:19:28 UTC (rev 521)
@@ -1,66 +1,44 @@
#! /usr/bin/env bash
-PWD_BACKUP=${PWD}
-SCRIPT_DIR=`dirname "${PWD}/$0"`
-cd "${SCRIPT_DIR}/.." || exit 1
-function fail() { cd "${PWD_BACKUP}" ; exit 1; }
+(
+cd $(dirname $(which "$0"))/.. || exit 1
####################################################################
+package=libxspf
+####################################################################
-INSTALL_DIR="${HOME}/install"
-PREFIX="--prefix=${INSTALL_DIR}"
-MAKE_PARAMS=-j10
-
-
echo ========== cleanup ==========
-rm libxspf-*.tar.* libxspf-*.zip &> /dev/null
-rm bindings/c/doc/*.zip &> /dev/null
-rm doc/*.zip &> /dev/null
-make clean &> /dev/null
-make distclean &> /dev/null
+rm -vf ${package}-*.{tar.*,zip} 2> /dev/null
+rm -vRf ${package}-* 2> /dev/null
echo
echo ========== bootstrap ==========
-./autogen.sh || fail
+./autogen.sh --download || exit 1
echo
echo ========== configure ==========
-./configure ${PREFIX} || fail
+./configure --enable-doc || exit 1
echo
-echo ========== make uninstall ==========
-make uninstall || fail
+echo ========== make distcheck ==========
+make -j10 distcheck || exit 1
echo
-echo ========== make ==========
-make ${MAKE_PARAMS} || fail
+echo ========== package docs ==========
+./doc/release.sh || exit 1
+./bindings/c/doc/release.sh || exit 1
+####################################################################
+)
+res=$?
+[ $res = 0 ] || exit $res
+cat <<'CHECKLIST'
-echo
-echo ========== make check ==========
-make check || fail
+Fine.
-
-echo
-echo ========== make install ==========
-make install || fail
-
-
-
-echo
-echo ========== make distcheck ==========
-make distcheck || fail
-
-
-
-echo
-echo Fine.
-
-echo
-cat <<'CHECKLIST'
Have you
-* run ./edit_version.sh
+* run ./scripts/edit_version.sh
* updated the soname
* updated file lists
- lazy header (Xspf.h)
@@ -70,8 +48,17 @@
* searched for TODO inside code using
grep -R 'TODO' include/* src/* test/*
?
-CHECKLIST
-####################################################################
-cd "${PWD_BACKUP}" || fail
-exit 0
+If so ..
+* upload release with ReleaseForge
+* announce through ..
+ - Blog
+ - Mailing lists
+ - Freshmeat
+ - SourceForge news
+* upload doc
+* update doc to website
+* tag svn trunk
+
+CHECKLIST
+exit $res
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <har...@us...> - 2009-02-18 01:19:23
|
Revision: 519
http://libspiff.svn.sourceforge.net/libspiff/?rev=519&view=rev
Author: hartwork
Date: 2009-02-18 01:19:19 +0000 (Wed, 18 Feb 2009)
Log Message:
-----------
Remove Zirkoros code from trunk as development of the Zirkoros extension will continue in branch 'zirkoros'
Modified Paths:
--------------
trunk/Makefile.am
trunk/win32/Code_Blocks/libxspf.cbp
trunk/win32/Code_Blocks/test.cbp
trunk/win32/Visual_Studio_2005/libxspf.vcproj
trunk/win32/Visual_Studio_2005/test.vcproj
Removed Paths:
-------------
trunk/include/xspf/ZirkorosOnline/
trunk/src/ZirkorosOnline/
trunk/test/ZirkorosOnline/
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2009-02-18 01:07:39 UTC (rev 518)
+++ trunk/Makefile.am 2009-02-18 01:19:19 UTC (rev 519)
@@ -66,10 +66,6 @@
src/ProjectOpus/ProjectOpusPlaylistExtensionReader.cpp \
src/ProjectOpus/ProjectOpusPlaylistExtensionWriter.cpp \
\
- src/ZirkorosOnline/ZirkorosOnlineTrackExtension.cpp \
- src/ZirkorosOnline/ZirkorosOnlineTrackExtensionReader.cpp \
- src/ZirkorosOnline/ZirkorosOnlineTrackExtensionWriter.cpp \
- \
bindings/c/xspf_c.cpp
@@ -111,15 +107,6 @@
-include_xspf_ZirkorosOnlinedir = $(prefix)/include/xspf/ZirkorosOnline
-
-include_xspf_ZirkorosOnline_HEADERS = \
- include/xspf/ZirkorosOnline/ZirkorosOnlineTrackExtension.h \
- include/xspf/ZirkorosOnline/ZirkorosOnlineTrackExtensionReader.h \
- include/xspf/ZirkorosOnline/ZirkorosOnlineTrackExtensionWriter.h
-
-
-
examples_check_xspf_check_LDADD = libxspf.la
examples_check_xspf_check_SOURCES = \
@@ -179,9 +166,6 @@
test/ProjectOpus/ProjectOpusSuite.cpp \
test/ProjectOpus/ProjectOpusSuite.h \
\
- test/ZirkorosOnline/ZirkorosOnlineSuite.h \
- test/ZirkorosOnline/ZirkorosOnlineSuite.cpp \
- \
test/ChunkCallbackSuite.cpp \
test/ChunkCallbackSuite.h \
test/DateTimeSuite.cpp \
Modified: trunk/win32/Code_Blocks/libxspf.cbp
===================================================================
--- trunk/win32/Code_Blocks/libxspf.cbp 2009-02-18 01:07:39 UTC (rev 518)
+++ trunk/win32/Code_Blocks/libxspf.cbp 2009-02-18 01:19:19 UTC (rev 519)
@@ -30,9 +30,6 @@
<Unit filename="..\..\include\xspf\ProjectOpus\ProjectOpusPlaylistExtension.h" />
<Unit filename="..\..\include\xspf\ProjectOpus\ProjectOpusPlaylistExtensionReader.h" />
<Unit filename="..\..\include\xspf\ProjectOpus\ProjectOpusPlaylistExtensionWriter.h" />
- <Unit filename="..\..\include\xspf\ZirkorosOnline\ZirkorosOnlineTrackExtension.h" />
- <Unit filename="..\..\include\xspf\ZirkorosOnline\ZirkorosOnlineTrackExtensionReader.h" />
- <Unit filename="..\..\include\xspf\ZirkorosOnline\ZirkorosOnlineTrackExtensionWriter.h" />
<Unit filename="..\..\include\xspf\Xspf.h" />
<Unit filename="..\..\include\xspf\XspfChunkCallback.h" />
<Unit filename="..\..\include\xspf\XspfData.h" />
@@ -56,9 +53,6 @@
<Unit filename="..\..\src\ProjectOpus\ProjectOpusPlaylistExtension.cpp" />
<Unit filename="..\..\src\ProjectOpus\ProjectOpusPlaylistExtensionReader.cpp" />
<Unit filename="..\..\src\ProjectOpus\ProjectOpusPlaylistExtensionWriter.cpp" />
- <Unit filename="..\..\src\ZirkorosOnline\ZirkorosOnlineTrackExtension.cpp" />
- <Unit filename="..\..\src\ZirkorosOnline\ZirkorosOnlineTrackExtensionReader.cpp" />
- <Unit filename="..\..\src\ZirkorosOnline\ZirkorosOnlineTrackExtensionWriter.cpp" />
<Unit filename="..\..\src\XspfChunkCallback.cpp" />
<Unit filename="..\..\src\XspfData.cpp" />
<Unit filename="..\..\src\XspfDataWriter.cpp" />
Modified: trunk/win32/Code_Blocks/test.cbp
===================================================================
--- trunk/win32/Code_Blocks/test.cbp 2009-02-18 01:07:39 UTC (rev 518)
+++ trunk/win32/Code_Blocks/test.cbp 2009-02-18 01:19:19 UTC (rev 519)
@@ -59,8 +59,6 @@
<Unit filename="..\..\test\OfficialSuite.h" />
<Unit filename="..\..\test\ProjectOpus\ProjectOpusSuite.cpp" />
<Unit filename="..\..\test\ProjectOpus\ProjectOpusSuite.h" />
- <Unit filename="..\..\test\ZirkorosOnline\ZirkorosOnlineSuite.cpp" />
- <Unit filename="..\..\test\ZirkorosOnline\ZirkorosOnlineSuite.h" />
<Unit filename="..\..\test\ReadWriteSuite.cpp" />
<Unit filename="..\..\test\ReadWriteSuite.h" />
<Unit filename="..\..\test\WhiteSpaceSuite.cpp" />
Modified: trunk/win32/Visual_Studio_2005/libxspf.vcproj
===================================================================
--- trunk/win32/Visual_Studio_2005/libxspf.vcproj 2009-02-18 01:07:39 UTC (rev 518)
+++ trunk/win32/Visual_Studio_2005/libxspf.vcproj 2009-02-18 01:19:19 UTC (rev 519)
@@ -536,34 +536,6 @@
>
</File>
</Filter>
- <Filter
- Name="ZirkorosOnline"
- >
- <File
- RelativePath="..\..\src\ZirkorosOnline\ZirkorosOnlineTrackExtension.cpp"
- >
- </File>
- <File
- RelativePath="..\..\include\xspf\ZirkorosOnline\ZirkorosOnlineTrackExtension.h"
- >
- </File>
- <File
- RelativePath="..\..\src\ZirkorosOnline\ZirkorosOnlineTrackExtensionReader.cpp"
- >
- </File>
- <File
- RelativePath="..\..\include\xspf\ZirkorosOnline\ZirkorosOnlineTrackExtensionReader.h"
- >
- </File>
- <File
- RelativePath="..\..\src\ZirkorosOnline\ZirkorosOnlineTrackExtensionWriter.cpp"
- >
- </File>
- <File
- RelativePath="..\..\include\xspf\ZirkorosOnline\ZirkorosOnlineTrackExtensionWriter.h"
- >
- </File>
- </Filter>
</Filter>
</Files>
<Globals>
Modified: trunk/win32/Visual_Studio_2005/test.vcproj
===================================================================
--- trunk/win32/Visual_Studio_2005/test.vcproj 2009-02-18 01:07:39 UTC (rev 518)
+++ trunk/win32/Visual_Studio_2005/test.vcproj 2009-02-18 01:19:19 UTC (rev 519)
@@ -287,18 +287,6 @@
>
</File>
</Filter>
- <Filter
- Name="ZirkorosOnline"
- >
- <File
- RelativePath="..\..\test\ZirkorosOnline\ZirkorosOnlineSuite.cpp"
- >
- </File>
- <File
- RelativePath="..\..\test\ZirkorosOnline\ZirkorosOnlineSuite.h"
- >
- </File>
- </Filter>
<File
RelativePath="..\..\test\ChunkCallbackSuite.cpp"
>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <har...@us...> - 2009-02-18 01:07:48
|
Revision: 518
http://libspiff.svn.sourceforge.net/libspiff/?rev=518&view=rev
Author: hartwork
Date: 2009-02-18 01:07:39 +0000 (Wed, 18 Feb 2009)
Log Message:
-----------
Create branch 'zirkoros'
Added Paths:
-----------
branches/zirkoros/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <har...@us...> - 2009-02-17 23:11:35
|
Revision: 517
http://libspiff.svn.sourceforge.net/libspiff/?rev=517&view=rev
Author: hartwork
Date: 2009-02-17 22:40:22 +0000 (Tue, 17 Feb 2009)
Log Message:
-----------
Remove files to due build system changes
Removed Paths:
-------------
trunk/bindings/c/doc/release.sh
trunk/doc/release.sh
Deleted: trunk/bindings/c/doc/release.sh
===================================================================
--- trunk/bindings/c/doc/release.sh 2009-02-17 22:31:34 UTC (rev 516)
+++ trunk/bindings/c/doc/release.sh 2009-02-17 22:40:22 UTC (rev 517)
@@ -1,39 +0,0 @@
-#! /usr/bin/env bash
-(
-cd $(dirname $(which "$0")) || exit 1
-
-distdir="xspf_c-doc-1.0.0"
-[ -z $MAKE ] && MAKE=make
-
-# Clean up
-rm -Rf "${distdir}" "${distdir}.zip"
-
-# Generate
-"${MAKE}" || exit 1
-
-# Copy
-mkdir -p "${distdir}/html"
-cp \
- html/*.css \
- html/*.gif \
- html/*.html \
- html/*.png \
- \
- "${distdir}/html/" || exit 1
-
-# Package
-zip -r "${distdir}.zip" "${distdir}" || exit 1
-
-cat <<INFO
-=================================================
-${distdir} archives ready for distribution:
-${distdir}.zip
-=================================================
-
-INFO
-
-# Clean up
-rm -Rf "${distdir}"
-
-)
-exit $?
Deleted: trunk/doc/release.sh
===================================================================
--- trunk/doc/release.sh 2009-02-17 22:31:34 UTC (rev 516)
+++ trunk/doc/release.sh 2009-02-17 22:40:22 UTC (rev 517)
@@ -1,39 +0,0 @@
-#! /usr/bin/env bash
-(
-cd $(dirname $(which "$0")) || exit 1
-
-distdir="libxspf-doc-1.0.0"
-[ -z $MAKE ] && MAKE=make
-
-# Clean up
-rm -Rf "${distdir}" "${distdir}.zip"
-
-# Generate
-"${MAKE}" || exit 1
-
-# Copy
-mkdir -p "${distdir}/html"
-cp \
- html/*.css \
- html/*.gif \
- html/*.html \
- html/*.png \
- \
- "${distdir}/html/" || exit 1
-
-# Package
-zip -r "${distdir}.zip" "${distdir}" || exit 1
-
-cat <<INFO
-=================================================
-${distdir} archives ready for distribution:
-${distdir}.zip
-=================================================
-
-INFO
-
-# Clean up
-rm -Rf "${distdir}"
-
-)
-exit $?
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <har...@us...> - 2009-02-17 23:10:36
|
Revision: 516
http://libspiff.svn.sourceforge.net/libspiff/?rev=516&view=rev
Author: hartwork
Date: 2009-02-17 22:31:34 +0000 (Tue, 17 Feb 2009)
Log Message:
-----------
Still rename transition and related fixes
Modified Paths:
--------------
trunk/ChangeLog
trunk/Makefile.am
trunk/TODO.txt
trunk/bindings/c/doc/Doxyfile.in
trunk/bindings/c/doc/Makefile.am
trunk/bindings/c/doc/configure.ac
trunk/bindings/c/doc/release.sh
trunk/bindings/c/xspf_c.cpp
trunk/bindings/c/xspf_c.h
trunk/configure.ac
trunk/doc/Doxyfile.in
trunk/doc/Mainpage
trunk/doc/Makefile.am
trunk/doc/configure.ac
trunk/doc/release.sh
trunk/examples/check/check.cpp
trunk/examples/read/read.cpp
trunk/examples/strip/strip.cpp
trunk/examples/write/write.cpp
trunk/include/xspf/ProjectOpus/ProjectOpusPlaylistExtension.h
trunk/include/xspf/ProjectOpus/ProjectOpusPlaylistExtensionReader.h
trunk/include/xspf/ProjectOpus/ProjectOpusPlaylistExtensionWriter.h
trunk/include/xspf/Xspf.h
trunk/include/xspf/XspfChunkCallback.h
trunk/include/xspf/XspfData.h
trunk/include/xspf/XspfDateTime.h
trunk/include/xspf/XspfDefines.h
trunk/include/xspf/XspfExtension.h
trunk/include/xspf/XspfExtensionReader.h
trunk/include/xspf/XspfExtensionReaderFactory.h
trunk/include/xspf/XspfExtensionWriter.h
trunk/include/xspf/XspfIndentFormatter.h
trunk/include/xspf/XspfProps.h
trunk/include/xspf/XspfReader.h
trunk/include/xspf/XspfReaderCallback.h
trunk/include/xspf/XspfSeamlessFormatter.h
trunk/include/xspf/XspfStack.h
trunk/include/xspf/XspfToolbox.h
trunk/include/xspf/XspfTrack.h
trunk/include/xspf/XspfVersion.h
trunk/include/xspf/XspfWriter.h
trunk/include/xspf/XspfXmlFormatter.h
trunk/include/xspf/ZirkorosOnline/ZirkorosOnlineTrackExtension.h
trunk/include/xspf/ZirkorosOnline/ZirkorosOnlineTrackExtensionReader.h
trunk/scripts/edit_version.sh
trunk/scripts/release.sh
trunk/src/ProjectOpus/ProjectOpusPlaylistExtension.cpp
trunk/src/ProjectOpus/ProjectOpusPlaylistExtensionReader.cpp
trunk/src/ProjectOpus/ProjectOpusPlaylistExtensionWriter.cpp
trunk/src/XspfChunkCallback.cpp
trunk/src/XspfData.cpp
trunk/src/XspfDataWriter.cpp
trunk/src/XspfDataWriter.h
trunk/src/XspfDateTime.cpp
trunk/src/XspfExtension.cpp
trunk/src/XspfExtensionReader.cpp
trunk/src/XspfExtensionReaderFactory.cpp
trunk/src/XspfExtensionWriter.cpp
trunk/src/XspfIndentFormatter.cpp
trunk/src/XspfProps.cpp
trunk/src/XspfPropsWriter.cpp
trunk/src/XspfPropsWriter.h
trunk/src/XspfReader.cpp
trunk/src/XspfReaderCallback.cpp
trunk/src/XspfSeamlessFormatter.cpp
trunk/src/XspfSkipExtensionReader.cpp
trunk/src/XspfSkipExtensionReader.h
trunk/src/XspfStrictReaderCallback.cpp
trunk/src/XspfStrictReaderCallback.h
trunk/src/XspfToolbox.cpp
trunk/src/XspfTrack.cpp
trunk/src/XspfTrackWriter.cpp
trunk/src/XspfTrackWriter.h
trunk/src/XspfWriter.cpp
trunk/src/XspfXmlFormatter.cpp
trunk/src/ZirkorosOnline/ZirkorosOnlineTrackExtension.cpp
trunk/src/ZirkorosOnline/ZirkorosOnlineTrackExtensionReader.cpp
trunk/test/ChunkCallbackSuite.cpp
trunk/test/ChunkCallbackSuite.h
trunk/test/DateTimeSuite.cpp
trunk/test/DateTimeSuite.h
trunk/test/ExtensionReaderFactorySuite.cpp
trunk/test/ExtensionReaderFactorySuite.h
trunk/test/MaliciousXmlSuite.cpp
trunk/test/MemoryModelSuite.cpp
trunk/test/OfficialSuite.cpp
trunk/test/OfficialSuite.h
trunk/test/ProjectOpus/ProjectOpusSuite.cpp
trunk/test/ProjectOpus/ProjectOpusSuite.h
trunk/test/ReadWriteSuite.cpp
trunk/test/WhiteSpaceSuite.cpp
trunk/win32/Code_Blocks/check.cbp
trunk/win32/Code_Blocks/libxspf.cbp
trunk/win32/Code_Blocks/libxspf.workspace
trunk/win32/Code_Blocks/read.cbp
trunk/win32/Code_Blocks/strip.cbp
trunk/win32/Code_Blocks/test.cbp
trunk/win32/Code_Blocks/write.cbp
trunk/win32/Visual_Studio_2005/check.vcproj
trunk/win32/Visual_Studio_2005/libxspf.sln
trunk/win32/Visual_Studio_2005/libxspf.vcproj
trunk/win32/Visual_Studio_2005/read.vcproj
trunk/win32/Visual_Studio_2005/strip.vcproj
trunk/win32/Visual_Studio_2005/test.vcproj
trunk/win32/Visual_Studio_2005/write.vcproj
Added Paths:
-----------
trunk/bindings/c/doc/release.sh.in
trunk/doc/release.sh.in
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-02-17 21:08:45 UTC (rev 515)
+++ trunk/ChangeLog 2009-02-17 22:31:34 UTC (rev 516)
@@ -1,5 +1,6 @@
???
+ * Changed: Rename from libSpiff to libxspf
* Fixed: Compile errors with GCC 4.4
Thanks to Martin Michlmayr for the patch!
* Fixed: Compile errors with Sun Ceres C++ 5.10
@@ -19,6 +20,7 @@
* doc/html/index.qhp
* bindings/c/doc/html/index.qhp
Generation requires Doxygen 1.5.7.1-20081103 or later.
+ * Improved: Nested configure hacks resolved
* Soname: 4:1:0
2008-09-21 -- 1.0.0
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2009-02-17 21:08:45 UTC (rev 515)
+++ trunk/Makefile.am 2009-02-17 22:31:34 UTC (rev 516)
@@ -9,19 +9,19 @@
bindings/c/doc
endif
-lib_LTLIBRARIES = libspiff.la
+lib_LTLIBRARIES = libxspf.la
bin_PROGRAMS = \
- examples/check/spiff_check \
- examples/strip/spiff_strip
+ examples/check/xspf_check \
+ examples/strip/xspf_strip
noinst_PROGRAMS = \
examples/read/example_read \
examples/write/example_write
-check_PROGRAMS = test/spiff_test
+check_PROGRAMS = test/xspf_test
-TESTS = test/spiff_test
+TESTS = test/xspf_test
@@ -32,35 +32,35 @@
-libspiff_la_LDFLAGS = -version-info 4:1:0
+libxspf_la_LDFLAGS = -version-info 4:1:0
-libspiff_la_SOURCES = \
- src/SpiffChunkCallback.cpp \
- src/SpiffData.cpp \
- src/SpiffDataWriter.cpp \
- src/SpiffDataWriter.h \
- src/SpiffDateTime.cpp \
- src/SpiffExtension.cpp \
- src/SpiffExtensionReader.cpp \
- src/SpiffExtensionReaderFactory.cpp \
- src/SpiffExtensionWriter.cpp \
- src/SpiffIndentFormatter.cpp \
- src/SpiffProps.cpp \
- src/SpiffPropsWriter.cpp \
- src/SpiffPropsWriter.h \
- src/SpiffReader.cpp \
- src/SpiffReaderCallback.cpp \
- src/SpiffSeamlessFormatter.cpp \
- src/SpiffSkipExtensionReader.cpp \
- src/SpiffSkipExtensionReader.h \
- src/SpiffStrictReaderCallback.cpp \
- src/SpiffStrictReaderCallback.h \
- src/SpiffToolbox.cpp \
- src/SpiffTrack.cpp \
- src/SpiffTrackWriter.cpp \
- src/SpiffTrackWriter.h \
- src/SpiffWriter.cpp \
- src/SpiffXmlFormatter.cpp \
+libxspf_la_SOURCES = \
+ src/XspfChunkCallback.cpp \
+ src/XspfData.cpp \
+ src/XspfDataWriter.cpp \
+ src/XspfDataWriter.h \
+ src/XspfDateTime.cpp \
+ src/XspfExtension.cpp \
+ src/XspfExtensionReader.cpp \
+ src/XspfExtensionReaderFactory.cpp \
+ src/XspfExtensionWriter.cpp \
+ src/XspfIndentFormatter.cpp \
+ src/XspfProps.cpp \
+ src/XspfPropsWriter.cpp \
+ src/XspfPropsWriter.h \
+ src/XspfReader.cpp \
+ src/XspfReaderCallback.cpp \
+ src/XspfSeamlessFormatter.cpp \
+ src/XspfSkipExtensionReader.cpp \
+ src/XspfSkipExtensionReader.h \
+ src/XspfStrictReaderCallback.cpp \
+ src/XspfStrictReaderCallback.h \
+ src/XspfToolbox.cpp \
+ src/XspfTrack.cpp \
+ src/XspfTrackWriter.cpp \
+ src/XspfTrackWriter.h \
+ src/XspfWriter.cpp \
+ src/XspfXmlFormatter.cpp \
\
src/ProjectOpus/ProjectOpusPlaylistExtension.cpp \
src/ProjectOpus/ProjectOpusPlaylistExtensionReader.cpp \
@@ -70,89 +70,89 @@
src/ZirkorosOnline/ZirkorosOnlineTrackExtensionReader.cpp \
src/ZirkorosOnline/ZirkorosOnlineTrackExtensionWriter.cpp \
\
- bindings/c/spiff_c.cpp
+ bindings/c/xspf_c.cpp
-include_spiffdir = $(prefix)/include/spiff
+include_xspfdir = $(prefix)/include/xspf
-include_spiff_HEADERS = \
- include/spiff/Spiff.h \
- include/spiff/SpiffChunkCallback.h \
- include/spiff/SpiffData.h \
- include/spiff/SpiffDateTime.h \
- include/spiff/SpiffDefines.h \
- include/spiff/SpiffExtension.h \
- include/spiff/SpiffExtensionReader.h \
- include/spiff/SpiffExtensionReaderFactory.h \
- include/spiff/SpiffExtensionWriter.h \
- include/spiff/SpiffIndentFormatter.h \
- include/spiff/SpiffProps.h \
- include/spiff/SpiffReader.h \
- include/spiff/SpiffReaderCallback.h \
- include/spiff/SpiffSeamlessFormatter.h \
- include/spiff/SpiffStack.h \
- include/spiff/SpiffToolbox.h \
- include/spiff/SpiffTrack.h \
- include/spiff/SpiffVersion.h \
- include/spiff/SpiffWriter.h \
- include/spiff/SpiffXmlFormatter.h \
+include_xspf_HEADERS = \
+ include/xspf/Xspf.h \
+ include/xspf/XspfChunkCallback.h \
+ include/xspf/XspfData.h \
+ include/xspf/XspfDateTime.h \
+ include/xspf/XspfDefines.h \
+ include/xspf/XspfExtension.h \
+ include/xspf/XspfExtensionReader.h \
+ include/xspf/XspfExtensionReaderFactory.h \
+ include/xspf/XspfExtensionWriter.h \
+ include/xspf/XspfIndentFormatter.h \
+ include/xspf/XspfProps.h \
+ include/xspf/XspfReader.h \
+ include/xspf/XspfReaderCallback.h \
+ include/xspf/XspfSeamlessFormatter.h \
+ include/xspf/XspfStack.h \
+ include/xspf/XspfToolbox.h \
+ include/xspf/XspfTrack.h \
+ include/xspf/XspfVersion.h \
+ include/xspf/XspfWriter.h \
+ include/xspf/XspfXmlFormatter.h \
\
- bindings/c/spiff_c.h
+ bindings/c/xspf_c.h
-include_spiff_ProjectOpusdir = $(prefix)/include/spiff/ProjectOpus
+include_xspf_ProjectOpusdir = $(prefix)/include/xspf/ProjectOpus
-include_spiff_ProjectOpus_HEADERS = \
- include/spiff/ProjectOpus/ProjectOpusPlaylistExtension.h \
- include/spiff/ProjectOpus/ProjectOpusPlaylistExtensionReader.h \
- include/spiff/ProjectOpus/ProjectOpusPlaylistExtensionWriter.h
+include_xspf_ProjectOpus_HEADERS = \
+ include/xspf/ProjectOpus/ProjectOpusPlaylistExtension.h \
+ include/xspf/ProjectOpus/ProjectOpusPlaylistExtensionReader.h \
+ include/xspf/ProjectOpus/ProjectOpusPlaylistExtensionWriter.h
-include_spiff_ZirkorosOnlinedir = $(prefix)/include/spiff/ZirkorosOnline
+include_xspf_ZirkorosOnlinedir = $(prefix)/include/xspf/ZirkorosOnline
-include_spiff_ZirkorosOnline_HEADERS = \
- include/spiff/ZirkorosOnline/ZirkorosOnlineTrackExtension.h \
- include/spiff/ZirkorosOnline/ZirkorosOnlineTrackExtensionReader.h \
- include/spiff/ZirkorosOnline/ZirkorosOnlineTrackExtensionWriter.h
+include_xspf_ZirkorosOnline_HEADERS = \
+ include/xspf/ZirkorosOnline/ZirkorosOnlineTrackExtension.h \
+ include/xspf/ZirkorosOnline/ZirkorosOnlineTrackExtensionReader.h \
+ include/xspf/ZirkorosOnline/ZirkorosOnlineTrackExtensionWriter.h
-examples_check_spiff_check_LDADD = libspiff.la
+examples_check_xspf_check_LDADD = libxspf.la
-examples_check_spiff_check_SOURCES = \
+examples_check_xspf_check_SOURCES = \
examples/check/check.cpp
-examples_read_example_read_LDADD = libspiff.la
+examples_read_example_read_LDADD = libxspf.la
examples_read_example_read_SOURCES = \
examples/read/read.cpp
-examples_strip_spiff_strip_LDADD = libspiff.la
+examples_strip_xspf_strip_LDADD = libxspf.la
-examples_strip_spiff_strip_SOURCES = \
+examples_strip_xspf_strip_SOURCES = \
examples/strip/strip.cpp
-examples_write_example_write_LDADD = libspiff.la
+examples_write_example_write_LDADD = libxspf.la
examples_write_example_write_SOURCES = \
examples/write/write.cpp
-test_spiff_test_LDADD = libspiff.la
+test_xspf_test_LDADD = libxspf.la
-test_spiff_test_CPPFLAGS = -DXSPF_SRCDIR=\"${srcdir}\"
+test_xspf_test_CPPFLAGS = -DXSPF_SRCDIR=\"${srcdir}\"
-test_spiff_test_SOURCES = \
+test_xspf_test_SOURCES = \
test/CppTest/collectoroutput.cpp \
test/CppTest/compileroutput.cpp \
test/CppTest/cpptest.h \
@@ -206,18 +206,20 @@
EXTRA_DIST = \
bindings/c/doc/aclocal.m4 \
bindings/c/doc/configure \
- bindings/c/doc/configure.in \
- bindings/c/doc/Doxyfile \
+ bindings/c/doc/configure.ac \
+ bindings/c/doc/Doxyfile.in \
bindings/c/doc/Makefile.am \
bindings/c/doc/Makefile.in \
+ bindings/c/doc/release.sh.in \
\
doc/aclocal.m4 \
doc/configure \
- doc/configure.in \
- doc/Doxyfile \
+ doc/configure.ac \
+ doc/Doxyfile.in \
doc/Mainpage \
doc/Makefile.am \
doc/Makefile.in \
+ doc/release.sh.in \
\
examples/read/playlist.xspf \
\
@@ -323,8 +325,8 @@
\
test/ProjectOpus/Example.xspf \
\
- win32/Code_Blocks/libspiff.cbp \
- win32/Code_Blocks/libspiff.workspace \
+ win32/Code_Blocks/libxspf.cbp \
+ win32/Code_Blocks/libxspf.workspace \
\
win32/Code_Blocks/check.cbp \
win32/Code_Blocks/read.cbp \
@@ -332,8 +334,8 @@
win32/Code_Blocks/test.cbp \
win32/Code_Blocks/write.cbp \
\
- win32/Visual_Studio_2005/libspiff.sln \
- win32/Visual_Studio_2005/libspiff.vcproj \
+ win32/Visual_Studio_2005/libxspf.sln \
+ win32/Visual_Studio_2005/libxspf.vcproj \
\
win32/Visual_Studio_2005/check.vcproj \
win32/Visual_Studio_2005/read.vcproj \
Modified: trunk/TODO.txt
===================================================================
--- trunk/TODO.txt 2009-02-17 21:08:45 UTC (rev 515)
+++ trunk/TODO.txt 2009-02-17 22:31:34 UTC (rev 516)
@@ -1,6 +1,6 @@
== BEFORE NEXT RELEASE ==
* Finish Zirkoros extension
- * xml:id support for SpiffTrack
+ * xml:id support for XspfTrack
== SOON ==
* @since tags everywhere
Modified: trunk/bindings/c/doc/Doxyfile.in
===================================================================
--- trunk/bindings/c/doc/Doxyfile.in 2009-02-17 21:08:45 UTC (rev 515)
+++ trunk/bindings/c/doc/Doxyfile.in 2009-02-17 22:31:34 UTC (rev 516)
@@ -2,8 +2,8 @@
# .qhp output
GENERATE_QHP = yes
-QHP_NAMESPACE = "net.sourceforge.libspiff"
-QHP_VIRTUAL_FOLDER = "spiff_c-@VERSION@"
+QHP_NAMESPACE = "net.sourceforge.libxspf"
+QHP_VIRTUAL_FOLDER = "xspf_c-@VERSION@"
# .qch output
QCH_FILE = "../@PACKAGE@-@VERSION@.qch"
@@ -15,7 +15,7 @@
###############################################################
-PROJECT_NAME = spiff_c
+PROJECT_NAME = xspf_c
# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by double-quotes) that should identify the project for which the documentation is generated. This name is used in the title of most generated pages and in a few other places.
Modified: trunk/bindings/c/doc/Makefile.am
===================================================================
--- trunk/bindings/c/doc/Makefile.am 2009-02-17 21:08:45 UTC (rev 515)
+++ trunk/bindings/c/doc/Makefile.am 2009-02-17 22:31:34 UTC (rev 516)
@@ -14,10 +14,12 @@
rm -f html/index.*
doxygen Doxyfile
-EXTRA_DIST = \
- Doxyfile \
- \
+DOC_FILES = \
html/*.css \
html/*.gif \
html/*.html \
html/*.png
+
+
+## Make doc files get installed
+nobase_nodist_doc_DATA = $(DOC_FILES)
Modified: trunk/bindings/c/doc/configure.ac
===================================================================
--- trunk/bindings/c/doc/configure.ac 2009-02-17 21:08:45 UTC (rev 515)
+++ trunk/bindings/c/doc/configure.ac 2009-02-17 22:31:34 UTC (rev 516)
@@ -2,17 +2,9 @@
AC_PREREQ(2.61)
AC_INIT(Doxyfile.in)
AC_CONFIG_AUX_DIR([../../../build-aux])
-AM_INIT_AUTOMAKE(spiff_c-doc, 1.0.0)
+AM_INIT_AUTOMAKE(xspf_c-doc, 1.1.0)
-## Nested configure hacks
-CALLED_BY_PARENT=0
-AC_ARG_ENABLE(doc, [], [
- CALLED_BY_PARENT=1
-], [])
-AM_CONDITIONAL(CALLED_BY_PARENT, test x${CALLED_BY_PARENT} = x1)
-
-
## Doxygen
AC_CHECK_PROG(DOXY_CHECK, doxygen, found, missing)
if test ${DOXY_CHECK} != "found" ; then
@@ -44,4 +36,5 @@
Doxyfile
Makefile
])
+AC_CONFIG_FILES([release.sh], [chmod a+x release.sh])
AC_OUTPUT
Modified: trunk/bindings/c/doc/release.sh
===================================================================
--- trunk/bindings/c/doc/release.sh 2009-02-17 21:08:45 UTC (rev 515)
+++ trunk/bindings/c/doc/release.sh 2009-02-17 22:31:34 UTC (rev 516)
@@ -1,25 +1,39 @@
-#! /bin/bash
-CUR=0
-COUNT=3
+#! /usr/bin/env bash
+(
+cd $(dirname $(which "$0")) || exit 1
-step() {
- PERC=$((100 * CUR / COUNT))
- printf "[%3i%%] %s" ${PERC} "$1"
- echo
- CUR=$((CUR + 1))
-}
+distdir="xspf_c-doc-1.0.0"
+[ -z $MAKE ] && MAKE=make
-./bootstrap.sh || exit 1
-echo
+# Clean up
+rm -Rf "${distdir}" "${distdir}.zip"
-step "configure"
-./configure || exit 1
+# Generate
+"${MAKE}" || exit 1
-step "make"
-make || exit 1
+# Copy
+mkdir -p "${distdir}/html"
+cp \
+ html/*.css \
+ html/*.gif \
+ html/*.html \
+ html/*.png \
+ \
+ "${distdir}/html/" || exit 1
-step "make dist"
-make dist || exit 1
+# Package
+zip -r "${distdir}.zip" "${distdir}" || exit 1
-step "."
-exit 0
+cat <<INFO
+=================================================
+${distdir} archives ready for distribution:
+${distdir}.zip
+=================================================
+
+INFO
+
+# Clean up
+rm -Rf "${distdir}"
+
+)
+exit $?
Added: trunk/bindings/c/doc/release.sh.in
===================================================================
--- trunk/bindings/c/doc/release.sh.in (rev 0)
+++ trunk/bindings/c/doc/release.sh.in 2009-02-17 22:31:34 UTC (rev 516)
@@ -0,0 +1,39 @@
+#! /usr/bin/env bash
+(
+cd $(dirname $(which "$0")) || exit 1
+
+distdir="@PACKAGE@-@VERSION@"
+[ -z $MAKE ] && MAKE=make
+
+# Clean up
+rm -Rf "${distdir}" "${distdir}.zip"
+
+# Generate
+"${MAKE}" || exit 1
+
+# Copy
+mkdir -p "${distdir}/html"
+cp \
+ html/*.css \
+ html/*.gif \
+ html/*.html \
+ html/*.png \
+ \
+ "${distdir}/html/" || exit 1
+
+# Package
+zip -r "${distdir}.zip" "${distdir}" || exit 1
+
+cat <<INFO
+=================================================
+${distdir} archives ready for distribution:
+${distdir}.zip
+=================================================
+
+INFO
+
+# Clean up
+rm -Rf "${distdir}"
+
+)
+exit $?
Property changes on: trunk/bindings/c/doc/release.sh.in
___________________________________________________________________
Added: svn:executable
+ *
Modified: trunk/bindings/c/xspf_c.cpp
===================================================================
--- trunk/bindings/c/xspf_c.cpp 2009-02-17 21:08:45 UTC (rev 515)
+++ trunk/bindings/c/xspf_c.cpp 2009-02-17 22:31:34 UTC (rev 516)
@@ -1,5 +1,5 @@
/*
- * spiff_c - Simple C interface for libxspf
+ * xspf_c - Simple C interface for libxspf
*
* Copyright (C) 2007, Ed Schouten / Xiph.Org Foundation
* Copyright (C) 2008, Sebastian Pipping / Xiph.Org Foundation
@@ -40,80 +40,80 @@
* Sebastian Pipping <sp...@xi...>
*/
/**
- * @file spiff_c.cpp
+ * @file xspf_c.cpp
* @brief Simple libxspf C bindings.
*/
-#include <spiff/SpiffIndentFormatter.h>
-#include <spiff/SpiffProps.h>
-#include <spiff/SpiffReader.h>
-#include <spiff/SpiffReaderCallback.h>
-#include <spiff/SpiffTrack.h>
-#include <spiff/SpiffWriter.h>
+#include <xspf/XspfIndentFormatter.h>
+#include <xspf/XspfProps.h>
+#include <xspf/XspfReader.h>
+#include <xspf/XspfReaderCallback.h>
+#include <xspf/XspfTrack.h>
+#include <xspf/XspfWriter.h>
#include <cstring>
extern "C" {
-#include "spiff_c.h"
+#include "xspf_c.h"
}
-using namespace Spiff;
+using namespace Xspf;
/**
- * @brief Spiff list reading callback, which stores data in a specific
- * C-style Spiff list.
+ * @brief Xspf list reading callback, which stores data in a specific
+ * C-style Xspf list.
*/
-class SpiffCReaderCallback : public SpiffReaderCallback {
+class XspfCReaderCallback : public XspfReaderCallback {
private:
/**
- * @brief The C-style Spiff list the tracks should be appended
+ * @brief The C-style Xspf list the tracks should be appended
* to.
*/
- spiff_list *list;
+ xspf_list *list;
/**
* @brief Pointer to the `next' field in the last inserted item
* for improving append speed.
*/
- spiff_track **newtrack;
+ xspf_track **newtrack;
/**
- * @brief Callback which adds tracks to the spiff_list.
+ * @brief Callback which adds tracks to the xspf_list.
*/
- void addTrack(SpiffTrack *track);
+ void addTrack(XspfTrack *track);
/**
- * @brief Callback which sets properties in the spiff_list.
+ * @brief Callback which sets properties in the xspf_list.
*/
- void setProps(SpiffProps *props);
+ void setProps(XspfProps *props);
public:
/**
- * @brief Create callback interface for filling a spiff_list.
+ * @brief Create callback interface for filling a xspf_list.
*/
- SpiffCReaderCallback(spiff_list *list);
+ XspfCReaderCallback(xspf_list *list);
/**
- * @brief Finalize the spiff_list.
+ * @brief Finalize the xspf_list.
*/
- virtual ~SpiffCReaderCallback();
+ virtual ~XspfCReaderCallback();
};
-SpiffCReaderCallback::SpiffCReaderCallback(spiff_list *list)
+XspfCReaderCallback::XspfCReaderCallback(xspf_list *list)
{
this->list = list;
newtrack = &list->tracks;
}
-SpiffCReaderCallback::~SpiffCReaderCallback()
+XspfCReaderCallback::~XspfCReaderCallback()
{
/* Null-terminate the tracks list */
*newtrack = NULL;
}
void
-SpiffCReaderCallback::addTrack(SpiffTrack *track)
+XspfCReaderCallback::addTrack(XspfTrack *track)
{
- spiff_mvalue **newmv;
+ xspf_mvalue **newmv;
char *str;
/* Append new item to the track list */
- *newtrack = new spiff_track;
+ *newtrack = new xspf_track;
(*newtrack)->creator = track->stealCreator();
(*newtrack)->title = track->stealTitle();
@@ -125,7 +125,7 @@
/* Locations */
newmv = &(*newtrack)->locations;
while ((str = track->stealFirstLocation()) != NULL) {
- *newmv = new spiff_mvalue;
+ *newmv = new xspf_mvalue;
(*newmv)->value = str;
(*newmv)->pdata = NULL;
@@ -137,7 +137,7 @@
/* Identifiers */
newmv = &(*newtrack)->identifiers;
while ((str = track->stealFirstIdentifier()) != NULL) {
- *newmv = new spiff_mvalue;
+ *newmv = new xspf_mvalue;
(*newmv)->value = str;
(*newmv)->pdata = NULL;
@@ -152,7 +152,7 @@
}
void
-SpiffCReaderCallback::setProps(SpiffProps *props)
+XspfCReaderCallback::setProps(XspfProps *props)
{
list->license = props->stealLicense();
list->location = props->stealLocation();
@@ -162,12 +162,12 @@
}
/**
- * @brief Deallocate all objects in a spiff_mvalue linked list.
+ * @brief Deallocate all objects in a xspf_mvalue linked list.
*/
static void
-spiff_mvalue_free(struct spiff_mvalue *mv)
+xspf_mvalue_free(struct xspf_mvalue *mv)
{
- struct spiff_mvalue *nmv;
+ struct xspf_mvalue *nmv;
for (; mv != NULL; mv = nmv) {
/* Back-up pointer */
@@ -181,17 +181,17 @@
* Public C interface
*/
-extern "C" struct spiff_list *
-spiff_parse(char const *filename, char const *baseuri)
+extern "C" struct xspf_list *
+xspf_parse(char const *filename, char const *baseuri)
{
- SpiffReader read;
- spiff_list *ret;
+ XspfReader read;
+ xspf_list *ret;
/* Allocate empty playlist */
- ret = new spiff_list;
+ ret = new xspf_list;
/* Fill the list with parser results */
- SpiffCReaderCallback readcb(ret);
+ XspfCReaderCallback readcb(ret);
if (read.parseFile(filename, &readcb, baseuri) == XSPF_READER_SUCCESS) {
/* Success */
return (ret);
@@ -202,12 +202,12 @@
}
}
-extern "C" struct spiff_list *
-spiff_new(void)
+extern "C" struct xspf_list *
+xspf_new(void)
{
- spiff_list *ret;
+ xspf_list *ret;
- ret = new spiff_list;
+ ret = new xspf_list;
ret->license = NULL;
ret->location = NULL;
ret->identifier = NULL;
@@ -218,9 +218,9 @@
}
extern "C" void
-spiff_free(struct spiff_list *list)
+xspf_free(struct xspf_list *list)
{
- spiff_track *tr, *ntr;
+ xspf_track *tr, *ntr;
delete [] list->license;
delete [] list->location;
@@ -234,8 +234,8 @@
delete [] tr->title;
delete [] tr->album;
- spiff_mvalue_free(tr->locations);
- spiff_mvalue_free(tr->identifiers);
+ xspf_mvalue_free(tr->locations);
+ xspf_mvalue_free(tr->identifiers);
delete tr;
}
@@ -244,7 +244,7 @@
}
extern "C" void
-spiff_setvalue(char **str, char const *nstr)
+xspf_setvalue(char **str, char const *nstr)
{
/* Delete old string */
delete [] *str;
@@ -261,12 +261,12 @@
}
}
-extern "C" struct spiff_mvalue *
-spiff_new_mvalue_before(struct spiff_mvalue **mvalue)
+extern "C" struct xspf_mvalue *
+xspf_new_mvalue_before(struct xspf_mvalue **mvalue)
{
- spiff_mvalue *ret;
+ xspf_mvalue *ret;
- ret = new spiff_mvalue;
+ ret = new xspf_mvalue;
ret->value = NULL;
ret->pdata = NULL;
ret->next = *mvalue;
@@ -275,12 +275,12 @@
return (ret);
}
-extern "C" struct spiff_track *
-spiff_new_track_before(struct spiff_track **track)
+extern "C" struct xspf_track *
+xspf_new_track_before(struct xspf_track **track)
{
- spiff_track *ret;
+ xspf_track *ret;
- ret = new spiff_track;
+ ret = new xspf_track;
ret->creator = NULL;
ret->title = NULL;
ret->album = NULL;
@@ -296,21 +296,21 @@
}
int
-spiff_write(struct spiff_list *list, char const *filename, char const *baseuri)
+xspf_write(struct xspf_list *list, char const *filename, char const *baseuri)
{
- spiff_track *strack;
- spiff_mvalue *smvalue;
- SpiffIndentFormatter formatter(-2);
+ xspf_track *strack;
+ xspf_mvalue *smvalue;
+ XspfIndentFormatter formatter(-2);
int error;
- SpiffWriter * const writer = SpiffWriter::makeWriter(formatter,
- baseuri, SpiffWriter::NO_XML_BASE, &error);
+ XspfWriter * const writer = XspfWriter::makeWriter(formatter,
+ baseuri, XspfWriter::NO_XML_BASE, &error);
if (writer == NULL) {
return error;
}
/* Playlist properties */
{
- SpiffProps props;
+ XspfProps props;
props.lendLicense(list->license);
props.lendLocation(list->location);
props.lendIdentifier(list->identifier);
@@ -319,7 +319,7 @@
XSPF_LIST_FOREACH_TRACK(list, strack) {
/* Tracks */
- SpiffTrack track;
+ XspfTrack track;
track.lendCreator(strack->creator);
track.lendTitle(strack->title);
track.lendAlbum(strack->album);
Modified: trunk/bindings/c/xspf_c.h
===================================================================
--- trunk/bindings/c/xspf_c.h 2009-02-17 21:08:45 UTC (rev 515)
+++ trunk/bindings/c/xspf_c.h 2009-02-17 22:31:34 UTC (rev 516)
@@ -1,5 +1,5 @@
/*
- * spiff_c - Simple C interface for libxspf
+ * xspf_c - Simple C interface for libxspf
*
* Copyright (C) 2007, Ed Schouten / Xiph.Org Foundation
* Copyright (C) 2008, Sebastian Pipping / Xiph.Org Foundation
@@ -40,7 +40,7 @@
* Sebastian Pipping <sp...@xi...>
*/
/**
- * @file spiff_c.h
+ * @file xspf_c.h
* @brief Simple libxspf C bindings.
*/
@@ -51,7 +51,7 @@
* @brief Linked list for values inside tracks or lists with string
* values.
*/
-struct spiff_mvalue {
+struct xspf_mvalue {
/**
* @brief Value of the current list entry.
*/
@@ -59,7 +59,7 @@
/**
* @brief Pointer to next object in the list.
*/
- struct spiff_mvalue *next;
+ struct xspf_mvalue *next;
/**
* @brief Private data that can be freely used.
@@ -70,7 +70,7 @@
/**
* @brief Single track in an XSPF list.
*/
-struct spiff_track {
+struct xspf_track {
/**
* @brief Track's creator.
*/
@@ -96,16 +96,16 @@
/**
* @brief Track's file locations.
*/
- struct spiff_mvalue *locations;
+ struct xspf_mvalue *locations;
/**
* @brief Unique track identifiers.
*/
- struct spiff_mvalue *identifiers;
+ struct xspf_mvalue *identifiers;
/**
* @brief Pointer to next track.
*/
- struct spiff_track *next;
+ struct xspf_track *next;
/**
* @brief Private data that can be freely used.
@@ -116,7 +116,7 @@
/**
* @brief Parsed XSPF file.
*/
-struct spiff_list {
+struct xspf_list {
/**
* @brief Playlist's license.
*/
@@ -133,7 +133,7 @@
/**
* @brief Linked list of tracks inside the playlist.
*/
- struct spiff_track *tracks;
+ struct xspf_track *tracks;
/**
* @brief Private data that can be freely used.
@@ -160,39 +160,39 @@
/**
* @brief Parse an XSPF file by filename.
*/
-struct spiff_list *spiff_parse(char const *filename, char const *baseuri);
+struct xspf_list *xspf_parse(char const *filename, char const *baseuri);
/**
* @brief Create a new empty XSPF playlist.
*/
-struct spiff_list *spiff_new(void);
+struct xspf_list *xspf_new(void);
/**
* @brief Free the parser results.
*/
-void spiff_free(struct spiff_list *list);
+void xspf_free(struct xspf_list *list);
/**
- * @brief Set or overwrite a value in the spiff_list, spiff_track or
- * spiff_mvalue structures. Passing NULL will unset the string.
+ * @brief Set or overwrite a value in the xspf_list, xspf_track or
+ * xspf_mvalue structures. Passing NULL will unset the string.
*/
-void spiff_setvalue(char **str, char const *nstr);
+void xspf_setvalue(char **str, char const *nstr);
/**
* @brief Insert a new mvalue to the linked list before the specified
* one. This routine can also be used to insert a new mvalue to
* the end of the list (or an empty list) by passing the address
* of the mvalue list or the next field in the last object.
*/
-struct spiff_mvalue *spiff_new_mvalue_before(
- struct spiff_mvalue **mvalue);
+struct xspf_mvalue *xspf_new_mvalue_before(
+ struct xspf_mvalue **mvalue);
/**
* @brief Insert a new track to the linked list before the specified
* one. This routine can also be used to insert a new track to
* the end of the list (or an empty list) by passing the address
* of the track list or the next field in the last object.
*/
-struct spiff_track *spiff_new_track_before(
- struct spiff_track **track);
+struct xspf_track *xspf_new_track_before(
+ struct xspf_track **track);
/**
- * @brief Write the Spiff playlist to a file.
+ * @brief Write the Xspf playlist to a file.
*/
-int spiff_write(struct spiff_list *list, char const *filename, char const *baseuri);
+int xspf_write(struct xspf_list *list, char const *filename, char const *baseuri);
#endif /* !XSPF_C_H */
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2009-02-17 21:08:45 UTC (rev 515)
+++ trunk/configure.ac 2009-02-17 22:31:34 UTC (rev 516)
@@ -1,8 +1,8 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
-AC_INIT(src/SpiffReader.cpp)
+AC_INIT(src/XspfReader.cpp)
AC_CONFIG_AUX_DIR([build-aux])
-AM_INIT_AUTOMAKE(libspiff, 1.0.0)
+AM_INIT_AUTOMAKE(libxspf, 1.1.0)
AM_CONFIG_HEADER(test/CppTest/config.h)
AC_PROG_LIBTOOL
@@ -91,10 +91,6 @@
], [])
AM_CONDITIONAL(GENERATE_DOC, test x${GENERATE_DOC} = x1)
-## Nested configure hacks
-AM_CONDITIONAL(CALLED_BY_PARENT, true)
-
-
# Local headers must come very first. Otherwise we
# risk including headers of an already installed
# libxspf version if its path is in CPPFLAGS
Modified: trunk/doc/Doxyfile.in
===================================================================
--- trunk/doc/Doxyfile.in 2009-02-17 21:08:45 UTC (rev 515)
+++ trunk/doc/Doxyfile.in 2009-02-17 22:31:34 UTC (rev 516)
@@ -2,8 +2,8 @@
# .qhp output
GENERATE_QHP = yes
-QHP_NAMESPACE = "net.sourceforge.libspiff"
-QHP_VIRTUAL_FOLDER = "libspiff-@VERSION@"
+QHP_NAMESPACE = "net.sourceforge.libxspf"
+QHP_VIRTUAL_FOLDER = "libxspf-@VERSION@"
# .qch output
QCH_FILE = "../@PACKAGE@-@VERSION@.qch"
Modified: trunk/doc/Mainpage
===================================================================
--- trunk/doc/Mainpage 2009-02-17 21:08:45 UTC (rev 515)
+++ trunk/doc/Mainpage 2009-02-17 22:31:34 UTC (rev 516)
@@ -20,7 +20,7 @@
* To read an XSPF playlist you first need a reader instance:
*
* @code
- * SpiffReaer reader;
+ * XspfReaer reader;
* @endcode
*
* You use the reader like this:
@@ -38,12 +38,12 @@
* want to verify that the given file is valid XSPF
* version 0 or 1 but do not need any more specific
* information about it. In general it is a pointer
- * to an instance of a class derived from SpiffReaderCallback.
+ * to an instance of a class derived from XspfReaderCallback.
* That means it can override these functions:
*
* @code
- * void addTrack(SpiffTrack * track);
- * void setProps(SpiffProps * props);
+ * void addTrack(XspfTrack * track);
+ * void setProps(XspfProps * props);
*
* void notifyFatalError(..);
* bool handleError(..);
@@ -86,7 +86,7 @@
*
* When reading is finished the value returned from parseFile() will be
* either <c>XSPF_READER_SUCCESS</c> or one of the error codes.
- * More details about the error occured are passed to the SpiffReaderCallback in use.
+ * More details about the error occured are passed to the XspfReaderCallback in use.
*
*
*
@@ -95,22 +95,22 @@
*
* @code
* XML_Char const * const baseUri = _PT("http://example.org/");
- * SpiffWriter * const writer = SpiffWriter::makeWriter(formatter, baseUri);
+ * XspfWriter * const writer = XspfWriter::makeWriter(formatter, baseUri);
* @endcode
*
* The first parameter is an XML formatter
- * (an instance of a class derived from SpiffXmlFormatter)
+ * (an instance of a class derived from XspfXmlFormatter)
* which will mainly control the whitespace in the XML output.
* libxspf already comes with two built-in formatters:
- * SpiffIndentFormatter which creates well-indented XML output
- * and SpiffSeamlessFormatter which does not create any whitespace at all.
+ * XspfIndentFormatter which creates well-indented XML output
+ * and XspfSeamlessFormatter which does not create any whitespace at all.
* The second parameter is the base URI used to shorten URIs where possible.
*
* If our playlist itself has properties we have to set them
* before adding any tracks:
*
* @code
- * SpiffProps props;
+ * XspfProps props;
* ...
* /* Fill in props */
* ...
@@ -120,7 +120,7 @@
* You could set the playlist's creation time like this:
*
* @code
- * SpiffDateTime dateTime(2006, 8, 28, 11, 30, 11, 1, 0);
+ * XspfDateTime dateTime(2006, 8, 28, 11, 30, 11, 1, 0);
* props.lendDate(&dateTime);
* @endcode
*
@@ -132,7 +132,7 @@
* existing memory. To make this more clear calling
*
* @code
- * props.giveTitle(_PT("Some title"), SpiffData::TRANSFER);
+ * props.giveTitle(_PT("Some title"), XspfData::TRANSFER);
* @endcode
*
* would be a bad idea since the memory would not be copied but still
@@ -144,7 +144,7 @@
*
* in this case.
*
- * Back to the writer: When you have created a SpiffWriter instance
+ * Back to the writer: When you have created a XspfWriter instance
* you can let it write its content to file:
*
* @code
@@ -155,7 +155,7 @@
* So before writing the playlist you should add your tracks:
*
* @code
- * SpiffTrack track;
+ * XspfTrack track;
* ...
* track.lendCreator(_PT("Breaking Benjamin"));
* ...
@@ -225,7 +225,7 @@
* reader.enableMaliciousXmlDetection(true);
* @endcode
*
- * you can make a SpiffReader instance protocol these metrics in order to detect
+ * you can make a XspfReader instance protocol these metrics in order to detect
* malicious XML. Also, all of these metrics can be limited and adjusted individually;
* for instance this is how to limit the lookup depth to a maximum of 2:
*
Modified: trunk/doc/Makefile.am
===================================================================
--- trunk/doc/Makefile.am 2009-02-17 21:08:45 UTC (rev 515)
+++ trunk/doc/Makefile.am 2009-02-17 22:31:34 UTC (rev 516)
@@ -21,21 +21,5 @@
html/*.png
-## Nested configure hacks
-if CALLED_BY_PARENT
-
-## Make doc get installed
+## Make doc files get installed
nobase_nodist_doc_DATA = $(DOC_FILES)
-
-## Kill automake error
-DIST_COMMON = $(DIST_COMMON)
-
-else
-
-## Make Automake not ship package sources
-DIST_COMMON =
-
-## Make doc go into dist when run from doc folder
-EXTRA_DIST = $(DOC_FILES)
-
-endif
Modified: trunk/doc/configure.ac
===================================================================
--- trunk/doc/configure.ac 2009-02-17 21:08:45 UTC (rev 515)
+++ trunk/doc/configure.ac 2009-02-17 22:31:34 UTC (rev 516)
@@ -2,17 +2,9 @@
AC_PREREQ(2.61)
AC_INIT(Doxyfile.in)
AC_CONFIG_AUX_DIR([../build-aux])
-AM_INIT_AUTOMAKE(libspiff-doc, 1.0.0)
+AM_INIT_AUTOMAKE(libxspf-doc, 1.1.0)
-## Nested configure hacks
-CALLED_BY_PARENT=0
-AC_ARG_ENABLE(doc, [], [
- CALLED_BY_PARENT=1
-], [])
-AM_CONDITIONAL(CALLED_BY_PARENT, test x${CALLED_BY_PARENT} = x1)
-
-
## Doxygen
AC_CHECK_PROG(DOXY_CHECK, doxygen, found, missing)
if test ${DOXY_CHECK} != "found" ; then
@@ -44,4 +36,5 @@
Doxyfile
Makefile
])
+AC_CONFIG_FILES([release.sh], [chmod a+x release.sh])
AC_OUTPUT
Modified: trunk/doc/release.sh
===================================================================
--- trunk/doc/release.sh 2009-02-17 21:08:45 UTC (rev 515)
+++ trunk/doc/release.sh 2009-02-17 22:31:34 UTC (rev 516)
@@ -1,25 +1,39 @@
-#! /bin/bash
-CUR=0
-COUNT=3
+#! /usr/bin/env bash
+(
+cd $(dirname $(which "$0")) || exit 1
-step() {
- PERC=$((100 * CUR / COUNT))
- printf "[%3i%%] %s" ${PERC} "$1"
- echo
- CUR=$((CUR + 1))
-}
+distdir="libxspf-doc-1.0.0"
+[ -z $MAKE ] && MAKE=make
-./bootstrap.sh || exit 1
-echo
+# Clean up
+rm -Rf "${distdir}" "${distdir}.zip"
-step "configure"
-./configure || exit 1
+# Generate
+"${MAKE}" || exit 1
-step "make"
-make || exit 1
+# Copy
+mkdir -p "${distdir}/html"
+cp \
+ html/*.css \
+ html/*.gif \
+ html/*.html \
+ html/*.png \
+ \
+ "${distdir}/html/" || exit 1
-step "make dist"
-make dist || exit 1
+# Package
+zip -r "${distdir}.zip" "${distdir}" || exit 1
-step "."
-exit 0
+cat <<INFO
+=================================================
+${distdir} archives ready for distribution:
+${distdir}.zip
+=================================================
+
+INFO
+
+# Clean up
+rm -Rf "${distdir}"
+
+)
+exit $?
Added: trunk/doc/release.sh.in
===================================================================
--- trunk/doc/release.sh.in (rev 0)
+++ trunk/doc/release.sh.in 2009-02-17 22:31:34 UTC (rev 516)
@@ -0,0 +1,39 @@
+#! /usr/bin/env bash
+(
+cd $(dirname $(which "$0")) || exit 1
+
+distdir="@PACKAGE@-@VERSION@"
+[ -z $MAKE ] && MAKE=make
+
+# Clean up
+rm -Rf "${distdir}" "${distdir}.zip"
+
+# Generate
+"${MAKE}" || exit 1
+
+# Copy
+mkdir -p "${distdir}/html"
+cp \
+ html/*.css \
+ html/*.gif \
+ html/*.html \
+ html/*.png \
+ \
+ "${distdir}/html/" || exit 1
+
+# Package
+zip -r "${distdir}.zip" "${distdir}" || exit 1
+
+cat <<INFO
+=================================================
+${distdir} archives ready for distribution:
+${distdir}.zip
+=================================================
+
+INFO
+
+# Clean up
+rm -Rf "${distdir}"
+
+)
+exit $?
Property changes on: trunk/doc/release.sh.in
___________________________________________________________________
Added: svn:executable
+ *
Modified: trunk/examples/check/check.cpp
===================================================================
--- trunk/examples/check/check.cpp 2009-02-17 21:08:45 UTC (rev 515)
+++ trunk/examples/check/check.cpp 2009-02-17 22:31:34 UTC (rev 516)
@@ -38,10 +38,10 @@
* Sebastian Pipping, sp...@xi...
*/
-#include <spiff/Spiff.h>
+#include <xspf/Xspf.h>
#include <iostream>
#include <cassert>
-using namespace Spiff;
+using namespace Xspf;
#if defined(__WIN32__) || defined(WIN32)
@@ -55,7 +55,7 @@
#endif
-class Validator : public SpiffReaderCallback {
+class Validator : public XspfReaderCallback {
private:
int version;
@@ -74,7 +74,7 @@
}
private:
- void setProps(SpiffProps * props) {
+ void setProps(XspfProps * props) {
this->version = props->getVersion();
delete props;
}
@@ -127,14 +127,14 @@
int
printUsage() {
- std::cout << "USAGE: spiff_check ([--loose] -|--version)" << std::endl << std::flush;
+ std::cout << "USAGE: xspf_check ([--loose] -|--version)" << std::endl << std::flush;
return 1;
}
int
printVersion() {
- std::cout << "spiff_check "
+ std::cout << "xspf_check "
<< XSPF_VER_MAJOR << "."
<< XSPF_VER_MINOR << "."
<< XSPF_VER_RELEASE
@@ -162,7 +162,7 @@
int const numBytes = static_cast<int>(strlen(memory));
// Valid XSPF?
- SpiffReader reader;
+ XspfReader reader;
Validator validator(loose);
int const res = reader.parseMemory(memory, numBytes, &validator,
_PT("http://www.example.org/"));
Modified: trunk/examples/read/read.cpp
===================================================================
--- trunk/examples/read/read.cpp 2009-02-17 21:08:45 UTC (rev 515)
+++ trunk/examples/read/read.cpp 2009-02-17 22:31:34 UTC (rev 516)
@@ -38,7 +38,7 @@
* Sebastian Pipping, sp...@xi...
*/
-#include <spiff/Spiff.h>
+#include <xspf/Xspf.h>
#include <uriparser/Uri.h>
#include <cstdio>
#include <cstdlib> // MAX_PATH
@@ -63,10 +63,10 @@
#endif
-using namespace Spiff;
+using namespace Xspf;
-class DemoReaderCallback : public SpiffReaderCallback {
+class DemoReaderCallback : public XspfReaderCallback {
bool valid;
@@ -76,7 +76,7 @@
}
private:
- void addTrack(SpiffTrack * track) {
+ void addTrack(XspfTrack * track) {
open(_PT("Track"));
printKeyValue(_PT("Album"), track->getAlbum());
printKeyValue(_PT("Annotation"), track->getAnnotation());
@@ -85,16 +85,16 @@
printIdentifierSummary(track);
printKeyValue(_PT("Image"), track->getImage());
printKeyValue(_PT("Info"), track->getInfo());
- printLinkSummay<SpiffTrack>(track);
+ printLinkSummay<XspfTrack>(track);
printLocationSummary(track);
- printMetaSummary<SpiffTrack>(track);
+ printMetaSummary<XspfTrack>(track);
printKeyValue(_PT("Title"), track->getTitle());
printKeyValue(_PT("TrackNum"), track->getTrackNum());
close();
delete track;
}
- void setProps(SpiffProps * props) {
+ void setProps(XspfProps * props) {
open(_PT("Props"));
printKeyValue(_PT("Annotation"), props->getAnnotation());
printAttributionSummary(props);
@@ -105,9 +105,9 @@
printKeyValue(_PT("Image"), props->getImage());
printKeyValue(_PT("Info"), props->getInfo());
printKeyValue(_PT("License"), props->getLicense());
- printLinkSummay<SpiffProps>(props);
+ printLinkSummay<XspfProps>(props);
printKeyValue(_PT("Location"), props->getLocation());
- printMetaSummary<SpiffProps>(props);
+ printMetaSummary<XspfProps>(props);
printKeyValue(_PT("Title"), props->getTitle());
printKeyValue(_PT("Version"), props->getVersion());
close();
@@ -152,7 +152,7 @@
}
}
- static void printKeyValue(XML_Char const * key, SpiffDateTime const * value) {
+ static void printKeyValue(XML_Char const * key, XspfDateTime const * value) {
if (value == NULL) {
PORT_PRINTF(_PT("\t%s: -\n"), key);
} else {
@@ -169,27 +169,27 @@
template <class T>
static void printLinkSummay(T * data) {
- int const size = (static_cast<SpiffData *>(data))->getLinkCount();
+ int const size = (static_cast<XspfData *>(data))->getLinkCount();
printHelper(_PT("Links"), size);
}
template <class T>
static void printMetaSummary(T * data) {
- int const size = (static_cast<SpiffData *>(data))->getMetaCount();
+ int const size = (static_cast<XspfData *>(data))->getMetaCount();
printHelper(_PT("Metas"), size);
}
- static void printAttributionSummary(SpiffProps * props) {
+ static void printAttributionSummary(XspfProps * props) {
int const size = props->getAttributionCount();
printHelper(_PT("Attributions"), size);
}
- static void printIdentifierSummary(SpiffTrack * track) {
+ static void printIdentifierSummary(XspfTrack * track) {
int const size = track->getIdentifierCount();
printHelper(_PT("Identifier"), size);
}
- static void printLocationSummary(SpiffTrack * track) {
+ static void printLocationSummary(XspfTrack * track) {
int const size = track->getLocationCount();
printHelper(_PT("Locations"), size);
}
@@ -249,8 +249,8 @@
int
PORT_MAIN() {
- SpiffReader reader;
- SpiffReaderCallback * callback = new DemoReaderCallback;
+ XspfReader reader;
+ XspfReaderCallback * callback = new DemoReaderCallback;
// Make base URI
XML_Char const * const relativeFilename = _PT("playlist.xspf");
Modified: trunk/examples/strip/strip.cpp
===================================================================
--- trunk/examples/strip/strip.cpp 2009-02-17 21:08:45 UTC (rev 515)
+++ trunk/examples/strip/strip.cpp 2009-02-17 22:31:34 UTC (rev 516)
@@ -38,41 +38,41 @@
* Sebastian Pipping, sp...@xi...
*/
-#include <spiff/Spiff.h>
+#include <xspf/Xspf.h>
#include <iostream>
#include <list>
#include <cassert>
-using namespace Spiff;
+using namespace Xspf;
-class Collector : public SpiffReaderCallback {
+class Collector : public XspfReaderCallback {
private:
- std::list<SpiffTrack *> * tracks;
- SpiffProps * props;
+ std::list<XspfTrack *> * tracks;
+ XspfProps * props;
public:
- Collector() : tracks(new std::list<SpiffTrack *>()), props(NULL) {
+ Collector() : tracks(new std::list<XspfTrack *>()), props(NULL) {
}
- std::list<SpiffTrack *> * stealTracks() {
- std::list<SpiffTrack *> * backup = this->tracks;
+ std::list<XspfTrack *> * stealTracks() {
+ std::list<XspfTrack *> * backup = this->tracks;
this->tracks = NULL;
return backup;
}
- SpiffProps * stealProps() {
- SpiffProps * backup = this->props;
+ XspfProps * stealProps() {
+ XspfProps * backup = this->props;
this->props = NULL;
return backup;
}
~Collector() {
if (this->tracks != NULL) {
- std::list<SpiffTrack *>::iterator iter = this->tracks->begin();
+ std::list<XspfTrack *>::iterator iter = this->tracks->begin();
while (iter != this->tracks->end()) {
- SpiffTrack * const track = *iter;
+ XspfTrack * const track = *iter;
delete track;
iter++;
}
@@ -84,11 +84,11 @@
}
private:
- void addTrack(SpiffTrack * track) {
+ void addTrack(XspfTrack * track) {
this->tracks->push_back(track);
}
- void setProps(SpiffProps * props) {
+ void setProps(XspfProps * props) {
this->props = props;
}
@@ -96,13 +96,13 @@
int printUsage() {
- std::cout << "USAGE: spiff_strip (-|--version)" << std::endl << std::flush;
+ std::cout << "USAGE: xspf_strip (-|--version)" << std::endl << std::flush;
return 1;
}
int printVersion() {
- std::cout << "spiff_strip "
+ std::cout << "xspf_strip "
<< XSPF_VER_MAJOR << "."
<< XSPF_VER_MINOR << "."
<< XSPF_VER_RELEASE
@@ -129,7 +129,7 @@
int const inputNumBytes = static_cast<int>(strlen(inputMemory));
// Parse and collect
- SpiffReader reader;
+ XspfReader reader;
Collector collector;
// XML_Char const * const stdinBaseUri = _PT("http://purl.org/posix/stdin");
// XML_Char const * const stdinBaseUri = _PT("std:in");
@@ -143,12 +143,12 @@
}
// Steal collected information
- std::list<SpiffTrack *> * const tracks = collector.stealTracks();
- SpiffProps * const props = collector.stealProps();
+ std::list<XspfTrack *> * const tracks = collector.stealTracks();
+ XspfProps * const props = collector.stealProps();
// Version 0, well-indented XML
- SpiffIndentFormatter formatter;
- SpiffWriter * const writer = SpiffWriter::makeWriter(
+ XspfIndentFormatter formatter;
+ XspfWriter * const writer = XspfWriter::makeWriter(
formatter, stdinBaseUri);
assert(writer != NULL);
props->setVersion(0);
@@ -156,9 +156,9 @@
delete props;
// Write all tracks
- std::list<SpiffTrack *>::iterator iter = tracks->begin();
+ std::list<XspfTrack *>::iterator iter = tracks->begin();
while (iter != tracks->end()) {
- SpiffTrack * const track = *iter;
+ XspfTrack * const track = *iter;
writer->addTrack(track);
delete track;
iter++;
Modified: trunk/examples/write/write.cpp
===================================================================
--- trunk/examples/write/write.cpp 2009-02-17 21:08:45 UTC (rev 515)
+++ trunk/examples/write/write.cpp 2009-02-17 22:31:34 UTC (rev 516)
@@ -38,69 +38,69 @@
* Sebastian Pipping, sp...@xi...
*/
-#include <spiff/Spiff.h>
-#include <spiff/ProjectOpus/ProjectOpusPlaylistExtension.h>
+#include <xspf/Xspf.h>
+#include <xspf/ProjectOpus/ProjectOpusPlaylistExtension.h>
#include <cstdio>
#include <cassert>
-using namespace Spiff;
-using namespace Spiff::Toolbox;
-using namespace Spiff::ProjectOpus;
+using namespace Xspf;
+using namespace Xspf::Toolbox;
+using namespace Xspf::ProjectOpus;
void
-fillProps(SpiffProps & props) {
+fillProps(XspfProps & props) {
// NOTE: When writing please make URIs relative where it makes sense.
// Most importantly this applies to track locations, so the playlist
// files can be moved along with the files.
- // SpiffToolbox::makeRelativeUri() can do that job for you.
+ // XspfToolbox::makeRelativeUri() can do that job for you.
// An example usage is shown below.
- props.giveTitle(_PT("Now playing"), SpiffData::COPY);
- props.giveAnnotation(_PT("Well, ..."), SpiffData::COPY);
- props.giveCreator(_PT("libxspf XSPF library"), SpiffData::COPY);
- SpiffDateTime dateTime(2006, 8, 28, 11, 30, 11, 1, 0);
- props.giveDate(&dateTime, SpiffData::COPY);
- props.giveIdentifier(_PT("xspf:libxspf:testId"), SpiffData::COPY);
- props.giveImage(_PT("some/image.png"), SpiffData::COPY);
- props.giveInfo(_PT("http://info/info"), SpiffData::COPY);
- props.giveLicense(_PT("http://license/free/"), SpiffData::COPY);
- props.giveLocation(_PT("http://playlist/home.xspf"), SpiffData::COPY);
+ props.giveTitle(_PT("Now playing"), XspfData::COPY);
+ props.giveAnnotation(_PT("Well, ..."), XspfData::COPY);
+ props.giveCreator(_PT("libxspf XSPF library"), XspfData::COPY);
+ XspfDateTime dateTime(2006, 8, 28, 11, 30, 11, 1, 0);
+ props.giveDate(&dateTime, XspfData::COPY);
+ props.giveIdentifier(_PT("xspf:libxspf:testId"), XspfData::COPY);
+ props.giveImage(_PT("some/image.png"), XspfData::COPY);
+ props.giveInfo(_PT("http://info/info"), XspfData::COPY);
+ props.giveLicense(_PT("http://license/free/"), XspfData::COPY);
+ props.giveLocation(_PT("http://playlist/home.xspf"), XspfData::COPY);
props.setVersion(0);
- props.giveAppendAttributionIdentifier(_PT("some:any/many"), SpiffData::COPY);
- props.giveAppendAttributionLocation(_PT("test:pest/west"), SpiffData::COPY);
- props.giveAppendLink(_PT("store:url"), SpiffData::COPY,
- _PT("http://expensive/dot/com"), SpiffData::COPY);
- props.giveAppendMeta(_PT("tag:meta:year"), SpiffData::COPY, _PT("2006"), SpiffData::COPY);
+ props.giveAppendAttributionIdentifier(_PT("some:any/many"), XspfData::COPY);
+ props.giveAppendAttributionLocation(_PT("test:pest/west"), XspfData::COPY);
+ props.giveAppendLink(_PT("store:url"), XspfData::COPY,
+ _PT("http://expensive/dot/com"), XspfData::COPY);
+ props.giveAppendMeta(_PT("tag:meta:year"), XspfData::COPY, _PT("2006"), XspfData::COPY);
// Add a playlist extension
ProjectOpusPlaylistExtension playlistExtension;
playlistExtension.setNodeId(123);
playlistExtension.setType(TYPE_ALBUM);
- props.giveAppendExtension(&playlistExtension, SpiffData::COPY);
+ props.giveAppendExtension(&playlistExtension, XspfData::COPY);
}
void
-fillTrack(SpiffTrack & track) {
+fillTrack(XspfTrack & track) {
// NOTE: When writing please make URIs relative where it makes sense.
// Most importantly this applies to track locations, so the playlist
// files can be moved along with the files.
- // SpiffToolbox::makeRelativeUri() can do that job for you.
+ // XspfToolbox::makeRelativeUri() can do that job for you.
// An example usage is shown below.
- track.giveAlbum(_PT("Phobia"), SpiffData::COPY);
- track.giveCreator(_PT("Breaking Benjamin"), SpiffData::COPY);
- track.giveTitle(_PT("Unknown Soldier"), SpiffData::COPY);
+ track.giveAlbum(_PT("Phobia"), XspfData::COPY);
+ track.giveCreator(_PT("Breaking Benjamin"), XspfData::COPY);
+ track.giveTitle(_PT("Unknown Soldier"), XspfData::COPY);
track.setTrackNum(10);
- track.giveAppendIdentifier(_PT("id:bb:unknownSoldier"), SpiffData::COPY);
- track.giveAppendLink(_PT("http://meta/key/uri/here"), SpiffData::COPY,
- _PT("http://website"), SpiffData::COPY);
+ track.giveAppendIdentifier(_PT("id:bb:unknownSoldier"), XspfData::COPY);
+ track.giveAppendLink(_PT("http://meta/key/uri/here"), XspfData::COPY,
+ _PT("http://website"), XspfData::COPY);
track.giveAppendLocation(
- _PT("http://example.org/10_unknown_soldier.ogg"), SpiffData::COPY);
- track.giveAppendMeta(_PT("tag:meta:year"), SpiffData::COPY, _PT("2006"), SpiffData::COPY);
- track.giveAnnotation(_PT("Great song"), SpiffData::COPY);
+ _PT("http://example.org/10_unknown_soldier.ogg"), XspfData::COPY);
+ track.giveAppendMeta(_PT("tag:meta:year"), XspfData::COPY, _PT("2006"), XspfData::COPY);
+ track.giveAnnotation(_PT("Great song"), XspfData::COPY);
track.setDuration(123000);
track.giveImage(
- _PT("http://example.org/some/image.png"), SpiffData::COPY);
- track.giveInfo(_PT("http://info/info"), SpiffData::COPY);
+ _PT("http://example.org/some/image.png"), XspfData::COPY);
+ track.giveInfo(_PT("http://info/info"), XspfData::COPY);
}
@@ -110,13 +110,13 @@
XML_Char const * const relativeFilename = _PT("TEST.xspf");
// Set up playlist props
- SpiffProps props;
+ XspfProps props;
fillProps(props);
// Version 1, well-indented XML
- SpiffIndentFormatter formatter;
- SpiffWriter * const writer = SpiffWriter::makeWriter(
- formatter, baseUri, SpiffWriter::EMBED_AS_XML_BASE);
+ XspfIndentFormatter formatter;
+ XspfWriter * const writer = XspfWriter::makeWriter(
+ formatter, baseUri, XspfWriter::EMBED_AS_XML_BASE);
assert(writer != NULL);
// Pre-register extension namespace so
@@ -125,7 +125,7 @@
::namespaceKey, _PT("po"));
// Set up track
- SpiffTrack track;
+ XspfTrack track;
fillTrack(track);
// Add track two times
Modified: trunk/include/xspf/ProjectOpus/ProjectOpusPlaylistExtension.h
===================================================================
--- trunk/include/xspf/ProjectOpus/ProjectOpusPlaylistExtension.h 2009-02-17 21:08:45 UTC (rev 515)
+++ trunk/include/xspf/ProjectOpus/ProjectOpusPlaylistExtension.h 2009-02-17 22:31:34 UTC (rev 516)
@@ -47,9 +47,9 @@
#define XSPF_PROJECT_OPUS_PLAYLIST_EXTENSION_H
-#include "../SpiffExtension.h"
+#include "../XspfExtension.h"
-namespace Spiff {
+namespace Xspf {
namespace ProjectOpus {
@@ -72,7 +72,7 @@
/**
* Represents a Project Opus playlist extension.
*/
-class ProjectOpusPlaylistExtension : public SpiffExtension {
+class ProjectOpusPlaylistExtension : public XspfExtension {
private:
/// @cond DOXYGEN_NON_API
@@ -132,10 +132,10 @@
*/
void setNodeId(unsigned int nodeId);
- SpiffExtension * clone() const;
+ XspfExtension * clone() const;
private:
- SpiffExtensionWriter * newWriter(SpiffXmlFormatter * output,
+ XspfExtensionWriter * newWriter(XspfXmlFormatter * output,
XML_Char const * baseUri) const;
public:
Modified: trunk/include/xspf/ProjectOpus/ProjectOpusPlaylistExtensionReader.h
===================================================================
--- trunk/include/xspf/ProjectOpus/ProjectOpusPlaylistExtensionReader.h 2009-02-17 21:08:45 UTC (rev 515)
+++ trunk/include/xspf/ProjectOpus/ProjectOpusPlaylistExtensionReader.h 2009-02-17 22:31:34 UTC (rev 516)
@@ -47,9 +47,9 @@
#define XSPF_PROJECT_OPUS_PLAYLIST_EXTENSION_READER_H
-#include "../SpiffExtensionReader.h"
+#include "../XspfExtensionReader.h"
-namespace Spiff {
+namespace Xspf {
namespace ProjectOpus {
@@ -59,7 +59,7 @@
/**
* Reads a Project Opus playlist extension.
*/
-class ProjectOpusPlaylistExtensionReader : public SpiffExtensionReader {
+class ProjectOpusPlaylistExtensionReader : public XspfExtensionReader {
private:
/// @cond DOXYGEN_NON_API
@@ -70,9 +70,9 @@
/**
* Creates a new Project Opus playlist extension reader.
*
- * @param reader SpiffReader to interact with
+ * @param reader XspfReader to interact with
*/
- ProjectOpusPlaylistExtensionReader(SpiffReader * reader);
+ ProjectOpusPlaylistExtensionReader(XspfReader * reader);
/**
* Copy constructor.
@@ -98,8 +98,8 @@
XML_Char const ** atts);
bool handleExtensionEnd(XML_Char const * fullName);
bool handleExtensionCharacters(XML_Char const * s, int len);
- SpiffExtension * wrap();
- SpiffExtensionReader * createBrother(SpiffReader * reader) const;
+ XspfExtension * wrap();
+ XspfExtensionReader * createBrother(XspfReader * reader) const;
/**
* Checks and extracts the attributes of an info element.
Modified: trunk/include/xspf/ProjectOpus/ProjectOpusPlaylistExtensionWriter.h
===================================================================
--- trunk/include/xspf/ProjectOpus/ProjectOpusPlaylistExtensionWriter.h 2009-02-17 21:08:45 UTC (rev 515)
+++ trunk/include/xspf/ProjectOpus/ProjectOpusPlaylistExtensionWriter.h 2009-02-17 22:31:34 UTC (rev 516)
@@ -47,13 +47,13 @@
#define XSPF_PROJECT_OPUS_PLAYLIST_EXTENSION_WRITER_H
-#include "../SpiffExtensionWriter.h"
+#include "../XspfExtensionWriter.h"
-namespace Spiff {
+namespace Xspf {
-class SpiffExtension;
-class SpiffXmlFormatter;
+class XspfExtension;
+class XspfXmlFormatter;
namespace ProjectOpus {
@@ -69,7 +69,7 @@
/**
* Writes a Project Opus playlist extension.
*/
-class ProjectOpusPlaylistExtensionWriter : public SpiffExtensionWriter {
+class ProjectOpusPlaylistExtensionWriter : public XspfExtensionWriter {
private:
/// @cond DOXYGEN_NON_API
@@ -86,7 +86,7 @@
*/
ProjectOpusPlaylistExtensionWriter(
ProjectOpusPlaylistExtension const * extension,
- SpiffXmlFormatter * output, XML_Char const * baseUri);
+ XspfXmlFormatter * output, XML_Char const * baseUri);
/**
* Copy constructor.
*
Modified: trunk/include/xspf/Xspf.h
===================================================================
--- trunk/include/xspf/Xspf.h 2009-02-17 21:08:45 UTC (rev 515)
+++ trunk/include/xspf/Xspf.h 2009-02-17 22:31:34 UTC (rev 516)
@@ -39,7 +39,7 @@
*/
/**
- * @file Spiff.h
+ * @file Xspf.h
* Include-everything header for lazy people with fast machines.
*/
@@ -48,31 +48,31 @@
/**
- * @namespace Spiff
+ * @namespace Xspf
* Provides reading and writing functionality
* for both XSPF-0 and XSPF-1.
*/
-// #include "Spiff.h"
- #include "SpiffChunkCallback.h"
-// #include "SpiffData.h"
- #include "SpiffDateTime.h"
-// #include "SpiffDefines.h"
- #include "SpiffExtension.h"
-// #include "SpiffExtensionReader.h"
- #include "SpiffExtensionReaderFactory.h"
- #include "SpiffExtensionWriter.h"
- #include "SpiffIndentFormatter.h"
- #include "SpiffProps.h"
- #include "SpiffReader.h"
- #include "SpiffReaderCallback.h"
- #include "SpiffSeamlessFormatter.h"
- #include "SpiffStack.h"
-// #include "SpiffToolbox.h"
- #include "SpiffTrack.h"
-// #include "SpiffVersion.h"
- #include "SpiffWriter.h"
-// #include "SpiffXmlFormatter.h"
+// #include "Xspf.h"
+ #include "XspfChunkCallback.h"
+// #include "XspfData.h"
+ #include "XspfDateTime.h"
+// #include "XspfDefines.h"
+ #include "XspfExtension.h"
+// #include "XspfExtensionReader.h"
+ #include "XspfExtensionReaderFactory.h"
+ #include "XspfExtensionWriter.h"
+ #include "XspfIndentFormatter.h"
+ #include "XspfProps.h"
+ #include "XspfReader.h"
+ #include "XspfReaderCallback.h"
+ #include "XspfSeamlessFormatter.h"
+ #include "XspfStack.h"
+// #include "XspfToolbox.h"
+ #include "XspfTrack.h"
+// #include "XspfVersion.h"
+ #include "XspfWriter.h"
+// #include "XspfXmlFormatter.h"
#endif // XSPF_H
Modified: trunk/include/xspf/XspfChunkCallback.h
===================================================================
--- trunk/include/xspf/XspfChunkCallback.h 2009-02-17 21:08:45 UTC (rev 515)
+++ trunk/include/xspf/XspfChunkCallback.h 2009-02-17 22:31:34 UTC (rev 516)
@@ -39,60 +39,60 @@
*/
/**
- * @file SpiffChunkCallback.h
- * Interface of SpiffChunkCallback.
+ * @file XspfChunkCallback.h
+ * Interface of XspfChunkCallback.
*/
#ifndef XSPF_CHUNK_CALLBACK_H
#define XSPF_CHUNK_CALLBACK_H
-namespace Spiff {
+namespace Xspf {
-class SpiffChunkCallbackPrivate;
+class XspfChunkCallbackPrivate;
/**
- * Hands out text chunks to a SpiffReader.
+ * Hands out text chunks to a XspfReader.
* This enables parsing from non-linear input
* structures. It can also be used to parse
* bug XSPF files in smaller chunks to lower
* memory usage.
*/
-class SpiffChunkCallback {
+class XspfChunkCallback {
- friend class SpiffReader;
+ friend class XspfReader;
private:
/// @cond DOXYGEN_NON_API
- SpiffChunkCallbackPrivate * const d; ///< D pointer
+ XspfChunkCallbackPrivate * const d; ///< D pointer
/// @endcond
protected:
/**
* Creates a new chunk callback.
*/
- SpiffChunkCallback();
+ XspfChunkCallback();
/**
* Copy constructor.
*
* @param source Source to copy from
*/
- SpiffChunkCallback(SpiffChunkCallback const & source);
+ XspfChunkCallback(XspfChunkCallback const & source);
/**
* Assignment operator.
*
* @param source Source to copy from
*/
- SpiffChunkCallback & operator=(SpiffChunkCallback const & source);
+ XspfChunkCallback & operator...
[truncated message content] |
|
From: <har...@us...> - 2009-02-17 21:08:51
|
Revision: 515
http://libspiff.svn.sourceforge.net/libspiff/?rev=515&view=rev
Author: hartwork
Date: 2009-02-17 21:08:45 +0000 (Tue, 17 Feb 2009)
Log Message:
-----------
Rename libSpiff to libxspf - step 2.2: string replace "SPIFF" to "XSPF"
Modified Paths:
--------------
trunk/Makefile.am
trunk/bindings/c/xspf_c.cpp
trunk/bindings/c/xspf_c.h
trunk/doc/Doxyfile.in
trunk/doc/Mainpage
trunk/examples/check/check.cpp
trunk/examples/read/read.cpp
trunk/examples/strip/strip.cpp
trunk/examples/write/write.cpp
trunk/include/xspf/ProjectOpus/ProjectOpusPlaylistExtension.h
trunk/include/xspf/ProjectOpus/ProjectOpusPlaylistExtensionReader.h
trunk/include/xspf/ProjectOpus/ProjectOpusPlaylistExtensionWriter.h
trunk/include/xspf/Xspf.h
trunk/include/xspf/XspfChunkCallback.h
trunk/include/xspf/XspfData.h
trunk/include/xspf/XspfDateTime.h
trunk/include/xspf/XspfDefines.h
trunk/include/xspf/XspfExtension.h
trunk/include/xspf/XspfExtensionReader.h
trunk/include/xspf/XspfExtensionReaderFactory.h
trunk/include/xspf/XspfExtensionWriter.h
trunk/include/xspf/XspfIndentFormatter.h
trunk/include/xspf/XspfProps.h
trunk/include/xspf/XspfReader.h
trunk/include/xspf/XspfReaderCallback.h
trunk/include/xspf/XspfSeamlessFormatter.h
trunk/include/xspf/XspfStack.h
trunk/include/xspf/XspfToolbox.h
trunk/include/xspf/XspfTrack.h
trunk/include/xspf/XspfVersion.h
trunk/include/xspf/XspfWriter.h
trunk/include/xspf/XspfXmlFormatter.h
trunk/include/xspf/ZirkorosOnline/ZirkorosOnlineTrackExtension.h
trunk/include/xspf/ZirkorosOnline/ZirkorosOnlineTrackExtensionReader.h
trunk/src/ProjectOpus/ProjectOpusPlaylistExtensionReader.cpp
trunk/src/XspfDataWriter.h
trunk/src/XspfIndentFormatter.cpp
trunk/src/XspfPropsWriter.h
trunk/src/XspfReader.cpp
trunk/src/XspfSkipExtensionReader.h
trunk/src/XspfStrictReaderCallback.h
trunk/src/XspfToolbox.cpp
trunk/src/XspfTrackWriter.h
trunk/src/XspfWriter.cpp
trunk/src/XspfXmlFormatter.cpp
trunk/test/ChunkCallbackSuite.cpp
trunk/test/ChunkCallbackSuite.h
trunk/test/DateTimeSuite.h
trunk/test/ExtensionReaderFactorySuite.h
trunk/test/MaliciousXmlSuite.cpp
trunk/test/MaliciousXmlSuite.h
trunk/test/MemoryModelSuite.h
trunk/test/OfficialSuite.cpp
trunk/test/OfficialSuite.h
trunk/test/ProjectOpus/ProjectOpusSuite.cpp
trunk/test/ProjectOpus/ProjectOpusSuite.h
trunk/test/ReadWriteSuite.cpp
trunk/test/ReadWriteSuite.h
trunk/test/WhiteSpaceSuite.h
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2009-02-17 20:56:50 UTC (rev 514)
+++ trunk/Makefile.am 2009-02-17 21:08:45 UTC (rev 515)
@@ -150,7 +150,7 @@
test_spiff_test_LDADD = libspiff.la
-test_spiff_test_CPPFLAGS = -DSPIFF_SRCDIR=\"${srcdir}\"
+test_spiff_test_CPPFLAGS = -DXSPF_SRCDIR=\"${srcdir}\"
test_spiff_test_SOURCES = \
test/CppTest/collectoroutput.cpp \
Modified: trunk/bindings/c/xspf_c.cpp
===================================================================
--- trunk/bindings/c/xspf_c.cpp 2009-02-17 20:56:50 UTC (rev 514)
+++ trunk/bindings/c/xspf_c.cpp 2009-02-17 21:08:45 UTC (rev 515)
@@ -192,7 +192,7 @@
/* Fill the list with parser results */
SpiffCReaderCallback readcb(ret);
- if (read.parseFile(filename, &readcb, baseuri) == SPIFF_READER_SUCCESS) {
+ if (read.parseFile(filename, &readcb, baseuri) == XSPF_READER_SUCCESS) {
/* Success */
return (ret);
} else {
@@ -317,7 +317,7 @@
writer->setProps(props);
}
- SPIFF_LIST_FOREACH_TRACK(list, strack) {
+ XSPF_LIST_FOREACH_TRACK(list, strack) {
/* Tracks */
SpiffTrack track;
track.lendCreator(strack->creator);
@@ -327,9 +327,9 @@
track.setTrackNum(strack->tracknum);
/* Track locations and identifiers */
- SPIFF_TRACK_FOREACH_LOCATION(strack,smvalue)
+ XSPF_TRACK_FOREACH_LOCATION(strack,smvalue)
track.lendAppendLocation(smvalue->value);
- SPIFF_TRACK_FOREACH_IDENTIFIER(strack, smvalue)
+ XSPF_TRACK_FOREACH_IDENTIFIER(strack, smvalue)
track.lendAppendIdentifier(smvalue->value);
writer->addTrack(track);
Modified: trunk/bindings/c/xspf_c.h
===================================================================
--- trunk/bindings/c/xspf_c.h 2009-02-17 20:56:50 UTC (rev 514)
+++ trunk/bindings/c/xspf_c.h 2009-02-17 21:08:45 UTC (rev 515)
@@ -44,8 +44,8 @@
* @brief Simple libxspf C bindings.
*/
-#ifndef SPIFF_C_H
-#define SPIFF_C_H
+#ifndef XSPF_C_H
+#define XSPF_C_H
/**
* @brief Linked list for values inside tracks or lists with string
@@ -144,17 +144,17 @@
/**
* @brief Easy interface for walking through tracks.
*/
-#define SPIFF_LIST_FOREACH_TRACK(l,t) \
+#define XSPF_LIST_FOREACH_TRACK(l,t) \
for ((t) = (l)->tracks; (t) != NULL; (t) = (t)->next)
/**
* @brief Easy interface for walking through locations.
*/
-#define SPIFF_TRACK_FOREACH_LOCATION(t,l) \
+#define XSPF_TRACK_FOREACH_LOCATION(t,l) \
for ((l) = (t)->locations; (l) != NULL; (l) = (l)->next)
/**
* @brief Easy interface for walking through identifiers.
*/
-#define SPIFF_TRACK_FOREACH_IDENTIFIER(t,i) \
+#define XSPF_TRACK_FOREACH_IDENTIFIER(t,i) \
for ((i) = (t)->identifiers; (i) != NULL; (i) = (i)->next)
/**
@@ -195,4 +195,4 @@
*/
int spiff_write(struct spiff_list *list, char const *filename, char const *baseuri);
-#endif /* !SPIFF_C_H */
+#endif /* !XSPF_C_H */
Modified: trunk/doc/Doxyfile.in
===================================================================
--- trunk/doc/Doxyfile.in 2009-02-17 20:56:50 UTC (rev 514)
+++ trunk/doc/Doxyfile.in 2009-02-17 21:08:45 UTC (rev 515)
@@ -759,7 +759,7 @@
# The INCLUDE_PATH tag can be used to specify one or more directories that contain include files that are not input files but should be processed by the preprocessor.
-PREDEFINED = SPIFF_DOXYGEN
+PREDEFINED = XSPF_DOXYGEN
# The PREDEFINED tag can be used to specify one or more macro names that are defined before the preprocessor is started (similar to the -D option of gcc). The argument of the tag is a list of macros of the form: name or name=definition (no spaces). If the definition and the "=" are omitted, "=1" is assumed. To prevent a macro definition from being undefined via #undef or recursively expanded use the := operator instead of the = operator.
Modified: trunk/doc/Mainpage
===================================================================
--- trunk/doc/Mainpage 2009-02-17 20:56:50 UTC (rev 514)
+++ trunk/doc/Mainpage 2009-02-17 21:08:45 UTC (rev 515)
@@ -85,7 +85,7 @@
* speed up the parsing process.
*
* When reading is finished the value returned from parseFile() will be
- * either <c>SPIFF_READER_SUCCESS</c> or one of the error codes.
+ * either <c>XSPF_READER_SUCCESS</c> or one of the error codes.
* More details about the error occured are passed to the SpiffReaderCallback in use.
*
*
Modified: trunk/examples/check/check.cpp
===================================================================
--- trunk/examples/check/check.cpp 2009-02-17 20:56:50 UTC (rev 514)
+++ trunk/examples/check/check.cpp 2009-02-17 21:08:45 UTC (rev 515)
@@ -115,9 +115,9 @@
<< std::endl << std::flush;
} else if (loose && !fatal) {
std::cout << "Not valid XSPF, still readable "
- << "by libxspf " << SPIFF_VER_MAJOR << "."
- << SPIFF_VER_MINOR << "." << SPIFF_VER_RELEASE
- << SPIFF_VER_SUFFIX_ASCII << "."
+ << "by libxspf " << XSPF_VER_MAJOR << "."
+ << XSPF_VER_MINOR << "." << XSPF_VER_RELEASE
+ << XSPF_VER_SUFFIX_ASCII << "."
<< std::endl << std::flush;
}
}
@@ -135,10 +135,10 @@
int
printVersion() {
std::cout << "spiff_check "
- << SPIFF_VER_MAJOR << "."
- << SPIFF_VER_MINOR << "."
- << SPIFF_VER_RELEASE
- << SPIFF_VER_SUFFIX_ASCII
+ << XSPF_VER_MAJOR << "."
+ << XSPF_VER_MINOR << "."
+ << XSPF_VER_RELEASE
+ << XSPF_VER_SUFFIX_ASCII
<< std::endl << std::flush;
return 0;
}
Modified: trunk/examples/read/read.cpp
===================================================================
--- trunk/examples/read/read.cpp 2009-02-17 20:56:50 UTC (rev 514)
+++ trunk/examples/read/read.cpp 2009-02-17 21:08:45 UTC (rev 515)
@@ -264,5 +264,5 @@
delete [] baseUri;
delete callback;
- return (res == SPIFF_READER_SUCCESS) ? 0 : 1;
+ return (res == XSPF_READER_SUCCESS) ? 0 : 1;
}
Modified: trunk/examples/strip/strip.cpp
===================================================================
--- trunk/examples/strip/strip.cpp 2009-02-17 20:56:50 UTC (rev 514)
+++ trunk/examples/strip/strip.cpp 2009-02-17 21:08:45 UTC (rev 515)
@@ -103,10 +103,10 @@
int printVersion() {
std::cout << "spiff_strip "
- << SPIFF_VER_MAJOR << "."
- << SPIFF_VER_MINOR << "."
- << SPIFF_VER_RELEASE
- << SPIFF_VER_SUFFIX
+ << XSPF_VER_MAJOR << "."
+ << XSPF_VER_MINOR << "."
+ << XSPF_VER_RELEASE
+ << XSPF_VER_SUFFIX
<< std::endl << std::flush;
return 0;
}
@@ -137,7 +137,7 @@
XML_Char const * const stdinBaseUri = _PT("file:///dev/stdin");
int const res = reader.parseMemory(inputMemory, inputNumBytes,
&collector, stdinBaseUri);
- if (res != SPIFF_READER_SUCCESS) {
+ if (res != XSPF_READER_SUCCESS) {
// Error
return 1;
}
@@ -167,7 +167,7 @@
// Write to memory block
char * outputMemory;
int outputNumBytes;
- bool success = (SPIFF_WRITER_SUCCESS == writer->writeMemory(
+ bool success = (XSPF_WRITER_SUCCESS == writer->writeMemory(
outputMemory, outputNumBytes));
delete writer;
if (!success) {
Modified: trunk/examples/write/write.cpp
===================================================================
--- trunk/examples/write/write.cpp 2009-02-17 20:56:50 UTC (rev 514)
+++ trunk/examples/write/write.cpp 2009-02-17 21:08:45 UTC (rev 515)
@@ -135,7 +135,7 @@
// Finish and write to file
int const res = writer->writeFile(relativeFilename);
delete writer;
- if (res != SPIFF_WRITER_SUCCESS) {
+ if (res != XSPF_WRITER_SUCCESS) {
PORT_PRINTF(_PT("Could not write to file.\n"));
return 1;
} else {
Modified: trunk/include/xspf/ProjectOpus/ProjectOpusPlaylistExtension.h
===================================================================
--- trunk/include/xspf/ProjectOpus/ProjectOpusPlaylistExtension.h 2009-02-17 20:56:50 UTC (rev 514)
+++ trunk/include/xspf/ProjectOpus/ProjectOpusPlaylistExtension.h 2009-02-17 21:08:45 UTC (rev 515)
@@ -43,8 +43,8 @@
* Interface of ProjectOpusPlaylistExtension.
*/
-#ifndef SPIFF_PROJECT_OPUS_PLAYLIST_EXTENSION_H
-#define SPIFF_PROJECT_OPUS_PLAYLIST_EXTENSION_H
+#ifndef XSPF_PROJECT_OPUS_PLAYLIST_EXTENSION_H
+#define XSPF_PROJECT_OPUS_PLAYLIST_EXTENSION_H
#include "../SpiffExtension.h"
@@ -164,4 +164,4 @@
}
}
-#endif // SPIFF_PROJECT_OPUS_PLAYLIST_EXTENSION_H
+#endif // XSPF_PROJECT_OPUS_PLAYLIST_EXTENSION_H
Modified: trunk/include/xspf/ProjectOpus/ProjectOpusPlaylistExtensionReader.h
===================================================================
--- trunk/include/xspf/ProjectOpus/ProjectOpusPlaylistExtensionReader.h 2009-02-17 20:56:50 UTC (rev 514)
+++ trunk/include/xspf/ProjectOpus/ProjectOpusPlaylistExtensionReader.h 2009-02-17 21:08:45 UTC (rev 515)
@@ -43,8 +43,8 @@
* Interface of ProjectOpusPlaylistExtensionReader.
*/
-#ifndef SPIFF_PROJECT_OPUS_PLAYLIST_EXTENSION_READER_H
-#define SPIFF_PROJECT_OPUS_PLAYLIST_EXTENSION_READER_H
+#ifndef XSPF_PROJECT_OPUS_PLAYLIST_EXTENSION_READER_H
+#define XSPF_PROJECT_OPUS_PLAYLIST_EXTENSION_READER_H
#include "../SpiffExtensionReader.h"
@@ -115,4 +115,4 @@
}
}
-#endif // SPIFF_PROJECT_OPUS_PLAYLIST_EXTENSION_READER_H
+#endif // XSPF_PROJECT_OPUS_PLAYLIST_EXTENSION_READER_H
Modified: trunk/include/xspf/ProjectOpus/ProjectOpusPlaylistExtensionWriter.h
===================================================================
--- trunk/include/xspf/ProjectOpus/ProjectOpusPlaylistExtensionWriter.h 2009-02-17 20:56:50 UTC (rev 514)
+++ trunk/include/xspf/ProjectOpus/ProjectOpusPlaylistExtensionWriter.h 2009-02-17 21:08:45 UTC (rev 515)
@@ -43,8 +43,8 @@
* Interface of ProjectOpusPlaylistExtensionWriter.
*/
-#ifndef SPIFF_PROJECT_OPUS_PLAYLIST_EXTENSION_WRITER_H
-#define SPIFF_PROJECT_OPUS_PLAYLIST_EXTENSION_WRITER_H
+#ifndef XSPF_PROJECT_OPUS_PLAYLIST_EXTENSION_WRITER_H
+#define XSPF_PROJECT_OPUS_PLAYLIST_EXTENSION_WRITER_H
#include "../SpiffExtensionWriter.h"
@@ -116,4 +116,4 @@
}
}
-#endif // SPIFF_PROJECT_OPUS_PLAYLIST_EXTENSION_WRITER_H
+#endif // XSPF_PROJECT_OPUS_PLAYLIST_EXTENSION_WRITER_H
Modified: trunk/include/xspf/Xspf.h
===================================================================
--- trunk/include/xspf/Xspf.h 2009-02-17 20:56:50 UTC (rev 514)
+++ trunk/include/xspf/Xspf.h 2009-02-17 21:08:45 UTC (rev 515)
@@ -43,8 +43,8 @@
* Include-everything header for lazy people with fast machines.
*/
-#ifndef SPIFF_H
-#define SPIFF_H
+#ifndef XSPF_H
+#define XSPF_H
/**
@@ -75,4 +75,4 @@
// #include "SpiffXmlFormatter.h"
-#endif // SPIFF_H
+#endif // XSPF_H
Modified: trunk/include/xspf/XspfChunkCallback.h
===================================================================
--- trunk/include/xspf/XspfChunkCallback.h 2009-02-17 20:56:50 UTC (rev 514)
+++ trunk/include/xspf/XspfChunkCallback.h 2009-02-17 21:08:45 UTC (rev 515)
@@ -43,8 +43,8 @@
* Interface of SpiffChunkCallback.
*/
-#ifndef SPIFF_CHUNK_CALLBACK_H
-#define SPIFF_CHUNK_CALLBACK_H
+#ifndef XSPF_CHUNK_CALLBACK_H
+#define XSPF_CHUNK_CALLBACK_H
namespace Spiff {
@@ -133,4 +133,4 @@
}
-#endif // SPIFF_CHUNK_CALLBACK_H
+#endif // XSPF_CHUNK_CALLBACK_H
Modified: trunk/include/xspf/XspfData.h
===================================================================
--- trunk/include/xspf/XspfData.h 2009-02-17 20:56:50 UTC (rev 514)
+++ trunk/include/xspf/XspfData.h 2009-02-17 21:08:45 UTC (rev 515)
@@ -43,8 +43,8 @@
* Interface of SpiffData.
*/
-#ifndef SPIFF_DATA_H
-#define SPIFF_DATA_H
+#ifndef XSPF_DATA_H
+#define XSPF_DATA_H
#include "SpiffDefines.h"
#include <deque>
@@ -508,4 +508,4 @@
}
-#endif // SPIFF_DATA_H
+#endif // XSPF_DATA_H
Modified: trunk/include/xspf/XspfDateTime.h
===================================================================
--- trunk/include/xspf/XspfDateTime.h 2009-02-17 20:56:50 UTC (rev 514)
+++ trunk/include/xspf/XspfDateTime.h 2009-02-17 21:08:45 UTC (rev 515)
@@ -43,8 +43,8 @@
* Interface of SpiffDateTime.
*/
-#ifndef SPIFF_DATE_TIME_H
-#define SPIFF_DATE_TIME_H
+#ifndef XSPF_DATE_TIME_H
+#define XSPF_DATE_TIME_H
#include "SpiffDefines.h"
@@ -243,4 +243,4 @@
} // namespace Spiff
-#endif // SPIFF_DATE_TIME_H
+#endif // XSPF_DATE_TIME_H
Modified: trunk/include/xspf/XspfDefines.h
===================================================================
--- trunk/include/xspf/XspfDefines.h 2009-02-17 20:56:50 UTC (rev 514)
+++ trunk/include/xspf/XspfDefines.h 2009-02-17 21:08:45 UTC (rev 515)
@@ -42,18 +42,18 @@
* @file SpiffDefines.h
*/
-#ifndef SPIFF_DEFINES_H
-#define SPIFF_DEFINES_H
+#ifndef XSPF_DEFINES_H
+#define XSPF_DEFINES_H
#include "SpiffVersion.h"
// Namespace handling
-#define SPIFF_NS_HOME _PT("http://xspf.org/ns/0/") ///< XSPF namespace URI
-#define SPIFF_NS_HOME_LEN 21 ///< XSPF namespace URI string length
-#define SPIFF_NS_SEP_CHAR _PT(' ') ///< Namespace separator as character
-#define SPIFF_NS_SEP_STRING _PT(" ") ///< Namespace separator as string
+#define XSPF_NS_HOME _PT("http://xspf.org/ns/0/") ///< XSPF namespace URI
+#define XSPF_NS_HOME_LEN 21 ///< XSPF namespace URI string length
+#define XSPF_NS_SEP_CHAR _PT(' ') ///< Namespace separator as character
+#define XSPF_NS_SEP_STRING _PT(" ") ///< Namespace separator as string
#define XML_NS_HOME _PT("http://www.w3.org/XML/1998/namespace") ///< XML namespace URI
#define XML_NS_HOME_LEN 36 ///< XML namespace URI string length
@@ -72,14 +72,14 @@
* Maximum size in bytes of a file that
* will be loaded into a buffer in whole
*/
-#define SPIFF_MAX_BLOCK_SIZE 100000
+#define XSPF_MAX_BLOCK_SIZE 100000
/// @cond DOXYGEN_IGNORE
// Deny overriding from outside
-#undef SPIFF_OS_WINDOWS
-#undef SPIFF_OS_UNIX
+#undef XSPF_OS_WINDOWS
+#undef XSPF_OS_UNIX
// Portability defines
@@ -89,7 +89,7 @@
#include <windows.h>
#include <tchar.h>
-#define SPIFF_OS_WINDOWS 1
+#define XSPF_OS_WINDOWS 1
// =================================
# ifdef UNICODE
@@ -104,42 +104,42 @@
#else
// Unix, ANSI ======================
-#define SPIFF_OS_UNIX 1
+#define XSPF_OS_UNIX 1
// =================================
#endif
// OS-specific selection macro
-#ifdef SPIFF_OS_WINDOWS
-# define SPIFF_OS_SELECT(windows, unix) windows
+#ifdef XSPF_OS_WINDOWS
+# define XSPF_OS_SELECT(windows, unix) windows
#else
-# ifdef SPIFF_OS_UNIX
-# define SPIFF_OS_SELECT(windows, unix) unix
+# ifdef XSPF_OS_UNIX
+# define XSPF_OS_SELECT(windows, unix) unix
# endif
#endif
-#define PORT_ATOI SPIFF_OS_SELECT(_ttoi, atoi)
-#define PORT_FOPEN SPIFF_OS_SELECT(_tfopen, fopen)
-#define PORT_MAIN SPIFF_OS_SELECT(_tmain, main)
-#define PORT_PRINTF SPIFF_OS_SELECT(_tprintf, printf)
+#define PORT_ATOI XSPF_OS_SELECT(_ttoi, atoi)
+#define PORT_FOPEN XSPF_OS_SELECT(_tfopen, fopen)
+#define PORT_MAIN XSPF_OS_SELECT(_tmain, main)
+#define PORT_PRINTF XSPF_OS_SELECT(_tprintf, printf)
#ifdef UNICODE
-# define PORT_SNPRINTF SPIFF_OS_SELECT(_snwprintf, snprintf)
+# define PORT_SNPRINTF XSPF_OS_SELECT(_snwprintf, snprintf)
#else
-# define PORT_SNPRINTF SPIFF_OS_SELECT(_snprintf, snprintf)
+# define PORT_SNPRINTF XSPF_OS_SELECT(_snprintf, snprintf)
#endif
-#define PORT_STRCMP SPIFF_OS_SELECT(_tcscmp, strcmp)
-#define PORT_STRCPY SPIFF_OS_SELECT(_tcscpy, strcpy)
-#define PORT_STRLEN SPIFF_OS_SELECT(_tcslen, strlen)
-#define PORT_STRNCMP SPIFF_OS_SELECT(_tcsncmp, strncmp)
-#define PORT_STRNCPY SPIFF_OS_SELECT(_tcsncpy, strncpy)
-#define PORT_STRNICMP SPIFF_OS_SELECT(_tcsnicmp, strnicmp)
-#define _PT(x) SPIFF_OS_SELECT(_T(x), x)
+#define PORT_STRCMP XSPF_OS_SELECT(_tcscmp, strcmp)
+#define PORT_STRCPY XSPF_OS_SELECT(_tcscpy, strcpy)
+#define PORT_STRLEN XSPF_OS_SELECT(_tcslen, strlen)
+#define PORT_STRNCMP XSPF_OS_SELECT(_tcsncmp, strncmp)
+#define PORT_STRNCPY XSPF_OS_SELECT(_tcsncpy, strncpy)
+#define PORT_STRNICMP XSPF_OS_SELECT(_tcsnicmp, strnicmp)
+#define _PT(x) XSPF_OS_SELECT(_T(x), x)
/// @endcond
-#endif // SPIFF_DEFINES_H
+#endif // XSPF_DEFINES_H
Modified: trunk/include/xspf/XspfExtension.h
===================================================================
--- trunk/include/xspf/XspfExtension.h 2009-02-17 20:56:50 UTC (rev 514)
+++ trunk/include/xspf/XspfExtension.h 2009-02-17 21:08:45 UTC (rev 515)
@@ -43,8 +43,8 @@
* Interface of SpiffExtension.
*/
-#ifndef SPIFF_EXTENSION_H
-#define SPIFF_EXTENSION_H
+#ifndef XSPF_EXTENSION_H
+#define XSPF_EXTENSION_H
#include "SpiffDefines.h"
@@ -133,4 +133,4 @@
} // namespace Spiff
-#endif // SPIFF_EXTENSION_H
+#endif // XSPF_EXTENSION_H
Modified: trunk/include/xspf/XspfExtensionReader.h
===================================================================
--- trunk/include/xspf/XspfExtensionReader.h 2009-02-17 20:56:50 UTC (rev 514)
+++ trunk/include/xspf/XspfExtensionReader.h 2009-02-17 21:08:45 UTC (rev 515)
@@ -43,8 +43,8 @@
* Interface of SpiffExtensionReader.
*/
-#ifndef SPIFF_EXTENSION_READER_H
-#define SPIFF_EXTENSION_READER_H
+#ifndef XSPF_EXTENSION_READER_H
+#define XSPF_EXTENSION_READER_H
#include "SpiffDefines.h"
@@ -208,4 +208,4 @@
} // namespace Spiff
-#endif // SPIFF_EXTENSION_READER_H
+#endif // XSPF_EXTENSION_READER_H
Modified: trunk/include/xspf/XspfExtensionReaderFactory.h
===================================================================
--- trunk/include/xspf/XspfExtensionReaderFactory.h 2009-02-17 20:56:50 UTC (rev 514)
+++ trunk/include/xspf/XspfExtensionReaderFactory.h 2009-02-17 21:08:45 UTC (rev 515)
@@ -43,8 +43,8 @@
* Interface of SpiffExtensionReaderFactory.
*/
-#ifndef SPIFF_EXTENSION_READER_FACTROY_H
-#define SPIFF_EXTENSION_READER_FACTROY_H
+#ifndef XSPF_EXTENSION_READER_FACTROY_H
+#define XSPF_EXTENSION_READER_FACTROY_H
#include "SpiffDefines.h"
@@ -218,4 +218,4 @@
}
-#endif // SPIFF_EXTENSION_READER_FACTROY_H
+#endif // XSPF_EXTENSION_READER_FACTROY_H
Modified: trunk/include/xspf/XspfExtensionWriter.h
===================================================================
--- trunk/include/xspf/XspfExtensionWriter.h 2009-02-17 20:56:50 UTC (rev 514)
+++ trunk/include/xspf/XspfExtensionWriter.h 2009-02-17 21:08:45 UTC (rev 515)
@@ -43,8 +43,8 @@
* Interface of SpiffExtensionWriter.
*/
-#ifndef SPIFF_EXTENSION_WRITER_H
-#define SPIFF_EXTENSION_WRITER_H
+#ifndef XSPF_EXTENSION_WRITER_H
+#define XSPF_EXTENSION_WRITER_H
#include "SpiffDefines.h"
@@ -167,4 +167,4 @@
} // namespace Spiff
-#endif // SPIFF_EXTENSION_WRITER_H
+#endif // XSPF_EXTENSION_WRITER_H
Modified: trunk/include/xspf/XspfIndentFormatter.h
===================================================================
--- trunk/include/xspf/XspfIndentFormatter.h 2009-02-17 20:56:50 UTC (rev 514)
+++ trunk/include/xspf/XspfIndentFormatter.h 2009-02-17 21:08:45 UTC (rev 515)
@@ -43,8 +43,8 @@
* Interface of SpiffIndentFormatter.
*/
-#ifndef SPIFF_INDENT_FORMATTER_H
-#define SPIFF_INDENT_FORMATTER_H
+#ifndef XSPF_INDENT_FORMATTER_H
+#define XSPF_INDENT_FORMATTER_H
#include "SpiffXmlFormatter.h"
@@ -106,4 +106,4 @@
}
-#endif // SPIFF_INDENT_FORMATTER_H
+#endif // XSPF_INDENT_FORMATTER_H
Modified: trunk/include/xspf/XspfProps.h
===================================================================
--- trunk/include/xspf/XspfProps.h 2009-02-17 20:56:50 UTC (rev 514)
+++ trunk/include/xspf/XspfProps.h 2009-02-17 21:08:45 UTC (rev 515)
@@ -43,8 +43,8 @@
* Interface of SpiffProps.
*/
-#ifndef SPIFF_PROPS_H
-#define SPIFF_PROPS_H
+#ifndef XSPF_PROPS_H
+#define XSPF_PROPS_H
#include "SpiffData.h"
@@ -373,4 +373,4 @@
}
-#endif // SPIFF_PROPS_H
+#endif // XSPF_PROPS_H
Modified: trunk/include/xspf/XspfReader.h
===================================================================
--- trunk/include/xspf/XspfReader.h 2009-02-17 20:56:50 UTC (rev 514)
+++ trunk/include/xspf/XspfReader.h 2009-02-17 21:08:45 UTC (rev 515)
@@ -43,8 +43,8 @@
* Interface of SpiffReader.
*/
-#ifndef SPIFF_READER_H
-#define SPIFF_READER_H
+#ifndef XSPF_READER_H
+#define XSPF_READER_H
#include "SpiffDefines.h"
@@ -57,25 +57,25 @@
/// @cond DOXYGEN_IGNORE
// Messages with ONE "%s" in it
-#define SPIFF_READER_TEXT_ONE_ATTRIBUTE_FORBIDDEN _PT("Attribute '%s' not allowed.")
-#define SPIFF_READER_TEXT_ONE_EXPAT_ERROR _PT("Expat error '%s'")
-#define SPIFF_READER_TEXT_ONE_ELEMENT_FORBIDDEN _PT("Element '%s' not allowed.")
-#define SPIFF_READER_TEXT_ONE_ELEMENT_FORBIDDEN_VERSION_ZERO _PT("Element '%s' not allowed in XSPF-0.")
-#define SPIFF_READER_TEXT_ONE_FILE_READING_ERROR _PT("File '%s' could not be read.")
-#define SPIFF_READER_TEXT_ONE_WRONG_ROOT_NAME _PT("Root element must be '") SPIFF_NS_HOME SPIFF_NS_SEP_STRING _PT("playlist', not '%s'.")
-#define SPIFF_READER_TEXT_ONE_WRONG_VERSION _PT("Version must be '0' or '1', not '%s'.")
+#define XSPF_READER_TEXT_ONE_ATTRIBUTE_FORBIDDEN _PT("Attribute '%s' not allowed.")
+#define XSPF_READER_TEXT_ONE_EXPAT_ERROR _PT("Expat error '%s'")
+#define XSPF_READER_TEXT_ONE_ELEMENT_FORBIDDEN _PT("Element '%s' not allowed.")
+#define XSPF_READER_TEXT_ONE_ELEMENT_FORBIDDEN_VERSION_ZERO _PT("Element '%s' not allowed in XSPF-0.")
+#define XSPF_READER_TEXT_ONE_FILE_READING_ERROR _PT("File '%s' could not be read.")
+#define XSPF_READER_TEXT_ONE_WRONG_ROOT_NAME _PT("Root element must be '") XSPF_NS_HOME XSPF_NS_SEP_STRING _PT("playlist', not '%s'.")
+#define XSPF_READER_TEXT_ONE_WRONG_VERSION _PT("Version must be '0' or '1', not '%s'.")
// Messages with ZERO "%s" in it
-#define SPIFF_READER_TEXT_ZERO_ATTRIBUTE_MISSING(name) _PT("Attribute '") name _PT("' missing.")
-#define SPIFF_READER_TEXT_ZERO_ELEMENT_MISSING(ns, name) _PT("Element '") ns SPIFF_NS_SEP_STRING name _PT("' missing.")
-#define SPIFF_READER_TEXT_ZERO_ELEMENT_MISSING_VERSION_ZERO(ns, name) _PT("Element '") ns SPIFF_NS_SEP_STRING name _PT("' missing. This is not allowed in XSPF-0.")
-#define SPIFF_READER_TEXT_ZERO_FILENAME_NULL _PT("Filename must not be NULL.")
-#define SPIFF_READER_TEXT_ZERO_TOO_MANY_ELEMENTS(ns, name) _PT("Only one '") ns SPIFF_NS_SEP_STRING name _PT("' allowed.")
-#define SPIFF_READER_TEXT_ZERO_WRONG_ATTRIBUTE_TYPE(attr, type) _PT("Attribute '") attr _PT("' is not a valid ") type _PT(".")
-#define SPIFF_READER_TEXT_ZERO_WRONG_CONTENT_TYPE(ns, elem, type) _PT("Content of '") ns SPIFF_NS_SEP_STRING elem _PT("' is not a valid ") type _PT(".")
-#define SPIFF_READER_TEXT_ZERO_TEXT_FORBIDDEN(ns, elem) _PT("Content of '") ns SPIFF_NS_SEP_STRING elem _PT("' must be whitespace or child elements, not text.")
-#define SPIFF_READER_TEXT_ZERO_KEY_WITHOUT_VERSION(name) _PT("Attribute '") name _PT("' does not carry version information.")
-#define SPIFF_READER_TEXT_ZERO_KEY_WITH_REL_URI(name) _PT("Attribute '") name _PT("' does not contain an absolute URI.")
+#define XSPF_READER_TEXT_ZERO_ATTRIBUTE_MISSING(name) _PT("Attribute '") name _PT("' missing.")
+#define XSPF_READER_TEXT_ZERO_ELEMENT_MISSING(ns, name) _PT("Element '") ns XSPF_NS_SEP_STRING name _PT("' missing.")
+#define XSPF_READER_TEXT_ZERO_ELEMENT_MISSING_VERSION_ZERO(ns, name) _PT("Element '") ns XSPF_NS_SEP_STRING name _PT("' missing. This is not allowed in XSPF-0.")
+#define XSPF_READER_TEXT_ZERO_FILENAME_NULL _PT("Filename must not be NULL.")
+#define XSPF_READER_TEXT_ZERO_TOO_MANY_ELEMENTS(ns, name) _PT("Only one '") ns XSPF_NS_SEP_STRING name _PT("' allowed.")
+#define XSPF_READER_TEXT_ZERO_WRONG_ATTRIBUTE_TYPE(attr, type) _PT("Attribute '") attr _PT("' is not a valid ") type _PT(".")
+#define XSPF_READER_TEXT_ZERO_WRONG_CONTENT_TYPE(ns, elem, type) _PT("Content of '") ns XSPF_NS_SEP_STRING elem _PT("' is not a valid ") type _PT(".")
+#define XSPF_READER_TEXT_ZERO_TEXT_FORBIDDEN(ns, elem) _PT("Content of '") ns XSPF_NS_SEP_STRING elem _PT("' must be whitespace or child elements, not text.")
+#define XSPF_READER_TEXT_ZERO_KEY_WITHOUT_VERSION(name) _PT("Attribute '") name _PT("' does not carry version information.")
+#define XSPF_READER_TEXT_ZERO_KEY_WITH_REL_URI(name) _PT("Attribute '") name _PT("' does not contain an absolute URI.")
/// @endcond
@@ -84,29 +84,29 @@
* Specifies the result of a parse operation.
*/
enum SpiffReaderReturnCode {
- SPIFF_READER_SUCCESS, ///< Everything fine
+ XSPF_READER_SUCCESS, ///< Everything fine
- SPIFF_READER_ERROR_NO_INPUT, ///< No input given
- SPIFF_READER_ERROR_ELEMENT_TOOMANY, ///< Element occurs more often than allowed
- SPIFF_READER_ERROR_ELEMENT_FORBIDDEN, ///< Element is not allowed at that place
- SPIFF_READER_ERROR_ELEMENT_MISSING, ///< Required element missing
- SPIFF_READER_ERROR_ATTRIBUTE_INVALID, ///< Attribute with invalid value
- SPIFF_READER_ERROR_ATTRIBUTE_MISSING, ///< Required attribute missing
- SPIFF_READER_ERROR_ATTRIBUTE_FORBIDDEN, ///< Attribute not allowed at that place
- SPIFF_READER_ERROR_CONTENT_INVALID, ///< Element body has invalid format
- SPIFF_READER_ERROR_BASE_URI_USELESS, ///< Given base URI is not a valid absolute URI
+ XSPF_READER_ERROR_NO_INPUT, ///< No input given
+ XSPF_READER_ERROR_ELEMENT_TOOMANY, ///< Element occurs more often than allowed
+ XSPF_READER_ERROR_ELEMENT_FORBIDDEN, ///< Element is not allowed at that place
+ XSPF_READER_ERROR_ELEMENT_MISSING, ///< Required element missing
+ XSPF_READER_ERROR_ATTRIBUTE_INVALID, ///< Attribute with invalid value
+ XSPF_READER_ERROR_ATTRIBUTE_MISSING, ///< Required attribute missing
+ XSPF_READER_ERROR_ATTRIBUTE_FORBIDDEN, ///< Attribute not allowed at that place
+ XSPF_READER_ERROR_CONTENT_INVALID, ///< Element body has invalid format
+ XSPF_READER_ERROR_BASE_URI_USELESS, ///< Given base URI is not a valid absolute URI
- SPIFF_READER_WARNING_KEY_WITHOUT_VERSION, ///< A key attribute holds an unversioned URI
- SPIFF_READER_WARNING_KEY_WITH_REL_URI, ///< A key attribute holds a relative URI
+ XSPF_READER_WARNING_KEY_WITHOUT_VERSION, ///< A key attribute holds an unversioned URI
+ XSPF_READER_WARNING_KEY_WITH_REL_URI, ///< A key attribute holds a relative URI
- SPIFF_READER_ERROR_MALICIOUS_SPACE, ///< An entity is taking to much space
- SPIFF_READER_ERROR_MALICIOUS_LOOKUP_SUM, ///< An entity takes to many lookups in sum
- SPIFF_READER_ERROR_MALICIOUS_LOOKUP_DEPTH, //< An entity's lookup depth is too high
+ XSPF_READER_ERROR_MALICIOUS_SPACE, ///< An entity is taking to much space
+ XSPF_READER_ERROR_MALICIOUS_LOOKUP_SUM, ///< An entity takes to many lookups in sum
+ XSPF_READER_ERROR_MALICIOUS_LOOKUP_DEPTH, //< An entity's lookup depth is too high
// Insert new codes HERE!
// This one must come last!
- SPIFF_READER_ERROR_EXPAT = 0x1000 /// First Expat error code
+ XSPF_READER_ERROR_EXPAT = 0x1000 /// First Expat error code
};
@@ -248,7 +248,7 @@
* Passing \c NULL will make the reader use a SpiffStrictReaderCallback
* instance internally.
* @param baseUri Absolute external base URI to resolve URIs against
- * @return Error/warning code that aborted parsing or \c SPIFF_READER_SUCCESS.
+ * @return Error/warning code that aborted parsing or \c XSPF_READER_SUCCESS.
* @since 1.0.0rc1
*/
int parseFile(XML_Char const * filename, SpiffReaderCallback * callback,
@@ -263,7 +263,7 @@
* Passing \c NULL will make the reader use a SpiffStrictReaderCallback
* instance internally.
* @param baseUri Absolute external base URI to resolve URIs against
- * @return Error/warning code that aborted parsing or \c SPIFF_READER_SUCCESS.
+ * @return Error/warning code that aborted parsing or \c XSPF_READER_SUCCESS.
* @since 1.0.0rc1
*/
int parseMemory(char const * memory, int numBytes, SpiffReaderCallback * callback,
@@ -277,7 +277,7 @@
* Passing \c NULL will make the reader use a SpiffStrictReaderCallback
* instance internally.
* @param baseUri Absolute external base URI to resolve URIs against
- * @return Error/warning code that aborted parsing or \c SPIFF_READER_SUCCESS.
+ * @return Error/warning code that aborted parsing or \c XSPF_READER_SUCCESS.
* @since 1.0.0rc1
*/
int parseChunks(SpiffChunkCallback * inputCallback,
@@ -695,4 +695,4 @@
} // namespace Spiff
-#endif // SPIFF_READER_H
+#endif // XSPF_READER_H
Modified: trunk/include/xspf/XspfReaderCallback.h
===================================================================
--- trunk/include/xspf/XspfReaderCallback.h 2009-02-17 20:56:50 UTC (rev 514)
+++ trunk/include/xspf/XspfReaderCallback.h 2009-02-17 21:08:45 UTC (rev 515)
@@ -43,8 +43,8 @@
* Interface of SpiffReaderCallback.
*/
-#ifndef SPIFF_READER_CALLBACK_H
-#define SPIFF_READER_CALLBACK_H
+#ifndef XSPF_READER_CALLBACK_H
+#define XSPF_READER_CALLBACK_H
#include "SpiffDefines.h"
@@ -156,4 +156,4 @@
} // namespace Spiff
-#endif // SPIFF_READER_CALLBACK_H
+#endif // XSPF_READER_CALLBACK_H
Modified: trunk/include/xspf/XspfSeamlessFormatter.h
===================================================================
--- trunk/include/xspf/XspfSeamlessFormatter.h 2009-02-17 20:56:50 UTC (rev 514)
+++ trunk/include/xspf/XspfSeamlessFormatter.h 2009-02-17 21:08:45 UTC (rev 515)
@@ -43,8 +43,8 @@
* Interface of SpiffSeamlessFormatter.
*/
-#ifndef SPIFF_SEAMLESS_FORMATTER_H
-#define SPIFF_SEAMLESS_FORMATTER_H
+#ifndef XSPF_SEAMLESS_FORMATTER_H
+#define XSPF_SEAMLESS_FORMATTER_H
#include "SpiffXmlFormatter.h"
@@ -105,4 +105,4 @@
}
-#endif // SPIFF_SEAMLESS_FORMATTER_H
+#endif // XSPF_SEAMLESS_FORMATTER_H
Modified: trunk/include/xspf/XspfStack.h
===================================================================
--- trunk/include/xspf/XspfStack.h 2009-02-17 20:56:50 UTC (rev 514)
+++ trunk/include/xspf/XspfStack.h 2009-02-17 21:08:45 UTC (rev 515)
@@ -43,8 +43,8 @@
* Interface and implemenatation of SpiffStack.
*/
-#ifndef SPIFF_STACK_H
-#define SPIFF_STACK_H
+#ifndef XSPF_STACK_H
+#define XSPF_STACK_H
#include "SpiffDefines.h"
@@ -102,4 +102,4 @@
}
-#endif // SPIFF_STACK_H
+#endif // XSPF_STACK_H
Modified: trunk/include/xspf/XspfToolbox.h
===================================================================
--- trunk/include/xspf/XspfToolbox.h 2009-02-17 20:56:50 UTC (rev 514)
+++ trunk/include/xspf/XspfToolbox.h 2009-02-17 21:08:45 UTC (rev 515)
@@ -43,8 +43,8 @@
* Interface of Spiff::Toolbox.
*/
-#ifndef SPIFF_TOOLBOX_H
-#define SPIFF_TOOLBOX_H
+#ifndef XSPF_TOOLBOX_H
+#define XSPF_TOOLBOX_H
#include "SpiffDefines.h"
@@ -255,4 +255,4 @@
} // namespace Toolbox
} // namespace Spiff
-#endif // SPIFF_TOOLBOX_H
+#endif // XSPF_TOOLBOX_H
Modified: trunk/include/xspf/XspfTrack.h
===================================================================
--- trunk/include/xspf/XspfTrack.h 2009-02-17 20:56:50 UTC (rev 514)
+++ trunk/include/xspf/XspfTrack.h 2009-02-17 21:08:45 UTC (rev 515)
@@ -43,8 +43,8 @@
* Interface of SpiffTrack.
*/
-#ifndef SPIFF_TRACK_H
-#define SPIFF_TRACK_H
+#ifndef XSPF_TRACK_H
+#define XSPF_TRACK_H
#include "SpiffData.h"
@@ -269,4 +269,4 @@
}
-#endif // SPIFF_TRACK_H
+#endif // XSPF_TRACK_H
Modified: trunk/include/xspf/XspfVersion.h
===================================================================
--- trunk/include/xspf/XspfVersion.h 2009-02-17 20:56:50 UTC (rev 514)
+++ trunk/include/xspf/XspfVersion.h 2009-02-17 21:08:45 UTC (rev 515)
@@ -43,16 +43,16 @@
* Holds libxspf version constants.
*/
-#ifndef SPIFF_VERSION_H
-#define SPIFF_VERSION_H
+#ifndef XSPF_VERSION_H
+#define XSPF_VERSION_H
// Version constants
-#define SPIFF_VER_MAJOR 1 ///< Major version number
-#define SPIFF_VER_MINOR 0 ///< Minor version number
-#define SPIFF_VER_RELEASE 0 ///< Release version number
-#define SPIFF_VER_SUFFIX_ASCII "" ///< ASCII Version suffix string (e.g. "rc1")
-#define SPIFF_VER_SUFFIX _PT(SPIFF_VER_SUFFIX_ASCII) ///< Version suffix string (e.g. "rc1")
+#define XSPF_VER_MAJOR 1 ///< Major version number
+#define XSPF_VER_MINOR 0 ///< Minor version number
+#define XSPF_VER_RELEASE 0 ///< Release version number
+#define XSPF_VER_SUFFIX_ASCII "" ///< ASCII Version suffix string (e.g. "rc1")
+#define XSPF_VER_SUFFIX _PT(XSPF_VER_SUFFIX_ASCII) ///< Version suffix string (e.g. "rc1")
-#endif // SPIFF_VERSION_H
+#endif // XSPF_VERSION_H
Modified: trunk/include/xspf/XspfWriter.h
===================================================================
--- trunk/include/xspf/XspfWriter.h 2009-02-17 20:56:50 UTC (rev 514)
+++ trunk/include/xspf/XspfWriter.h 2009-02-17 21:08:45 UTC (rev 515)
@@ -43,8 +43,8 @@
* Interface of SpiffWriter.
*/
-#ifndef SPIFF_WRITER_H
-#define SPIFF_WRITER_H
+#ifndef XSPF_WRITER_H
+#define XSPF_WRITER_H
#include "SpiffDefines.h"
@@ -61,10 +61,10 @@
* Specifies the result of a write operation.
*/
enum SpiffWriterReturnCode {
- SPIFF_WRITER_SUCCESS, ///< Everything fine
+ XSPF_WRITER_SUCCESS, ///< Everything fine
- SPIFF_WRITER_ERROR_OPENING, ///< File could not be opened
- SPIFF_WRITER_ERROR_BASE_URI_USELESS ///< Given base URI is not a valid absolute URI
+ XSPF_WRITER_ERROR_OPENING, ///< File could not be opened
+ XSPF_WRITER_ERROR_BASE_URI_USELESS ///< Given base URI is not a valid absolute URI
};
@@ -103,7 +103,7 @@
* @param embedBase Embeds base URI as xml:base in root
* node if true or not if false
* @param errorCode Place to write error code or
- * \c SPIFF_WRITER_SUCCESS to.
+ * \c XSPF_WRITER_SUCCESS to.
* @return \c NULL on error or a new'ed SpiffWriter
* that you have to delete manually later.
* @since 1.0.0
@@ -252,4 +252,4 @@
}
-#endif // SPIFF_WRITER_H
+#endif // XSPF_WRITER_H
Modified: trunk/include/xspf/XspfXmlFormatter.h
===================================================================
--- trunk/include/xspf/XspfXmlFormatter.h 2009-02-17 20:56:50 UTC (rev 514)
+++ trunk/include/xspf/XspfXmlFormatter.h 2009-02-17 21:08:45 UTC (rev 515)
@@ -43,8 +43,8 @@
* Interface of SpiffXmlFormatter.
*/
-#ifndef SPIFF_XML_FORMATTER_H
-#define SPIFF_XML_FORMATTER_H
+#ifndef XSPF_XML_FORMATTER_H
+#define XSPF_XML_FORMATTER_H
#include "SpiffDefines.h"
@@ -269,4 +269,4 @@
} // namespace Spiff
-#endif // SPIFF_XML_FORMATTER_H
+#endif // XSPF_XML_FORMATTER_H
Modified: trunk/include/xspf/ZirkorosOnline/ZirkorosOnlineTrackExtension.h
===================================================================
--- trunk/include/xspf/ZirkorosOnline/ZirkorosOnlineTrackExtension.h 2009-02-17 20:56:50 UTC (rev 514)
+++ trunk/include/xspf/ZirkorosOnline/ZirkorosOnlineTrackExtension.h 2009-02-17 21:08:45 UTC (rev 515)
@@ -45,8 +45,8 @@
* Interface of ZirkorosOnlineTrackExtension.
*/
-#ifndef SPIFF_ZIRKOROS_ONLINE_TRACK_EXTENSION_H
-#define SPIFF_ZIRKOROS_ONLINE_TRACK_EXTENSION_H
+#ifndef XSPF_ZIRKOROS_ONLINE_TRACK_EXTENSION_H
+#define XSPF_ZIRKOROS_ONLINE_TRACK_EXTENSION_H
#include "../SpiffExtension.h"
@@ -100,4 +100,4 @@
}
}
-#endif // SPIFF_ZIRKOROS_ONLINE_TRACK_EXTENSION_H
+#endif // XSPF_ZIRKOROS_ONLINE_TRACK_EXTENSION_H
Modified: trunk/include/xspf/ZirkorosOnline/ZirkorosOnlineTrackExtensionReader.h
===================================================================
--- trunk/include/xspf/ZirkorosOnline/ZirkorosOnlineTrackExtensionReader.h 2009-02-17 20:56:50 UTC (rev 514)
+++ trunk/include/xspf/ZirkorosOnline/ZirkorosOnlineTrackExtensionReader.h 2009-02-17 21:08:45 UTC (rev 515)
@@ -45,8 +45,8 @@
* Interface of ZirkorosOnlineTrackExtensionReader.
*/
-#ifndef SPIFF_ZIRKOROS_ONLINE_TRACK_EXTENSION_READER_H
-#define SPIFF_ZIRKOROS_ONLINE_TRACK_EXTENSION_READER_H
+#ifndef XSPF_ZIRKOROS_ONLINE_TRACK_EXTENSION_READER_H
+#define XSPF_ZIRKOROS_ONLINE_TRACK_EXTENSION_READER_H
#include "../SpiffExtensionReader.h"
@@ -107,4 +107,4 @@
}
}
-#endif // SPIFF_ZIRKOROS_ONLINE_TRACK_EXTENSION_READER_H
+#endif // XSPF_ZIRKOROS_ONLINE_TRACK_EXTENSION_READER_H
Modified: trunk/src/ProjectOpus/ProjectOpusPlaylistExtensionReader.cpp
===================================================================
--- trunk/src/ProjectOpus/ProjectOpusPlaylistExtensionReader.cpp 2009-02-17 20:56:50 UTC (rev 514)
+++ trunk/src/ProjectOpus/ProjectOpusPlaylistExtensionReader.cpp 2009-02-17 21:08:45 UTC (rev 515)
@@ -143,16 +143,16 @@
// Check and skip namespace
if (::PORT_STRNCMP(fullName, PROJECT_OPUS_NS_HOME, PROJECT_OPUS_NS_HOME_LEN)
|| ::PORT_STRCMP(fullName + PROJECT_OPUS_NS_HOME_LEN + 1, _PT("info"))) {
- handleError(SPIFF_READER_ERROR_ELEMENT_FORBIDDEN,
- SPIFF_READER_TEXT_ONE_ELEMENT_FORBIDDEN,
+ handleError(XSPF_READER_ERROR_ELEMENT_FORBIDDEN,
+ XSPF_READER_TEXT_ONE_ELEMENT_FORBIDDEN,
fullName);
return false;
}
// One info at most
if (!this->d->firstInfo) {
- handleError(SPIFF_READER_ERROR_ELEMENT_TOOMANY,
- SPIFF_READER_TEXT_ZERO_TOO_MANY_ELEMENTS(PROJECT_OPUS_NS_HOME, _PT("info")));
+ handleError(XSPF_READER_ERROR_ELEMENT_TOOMANY,
+ XSPF_READER_TEXT_ZERO_TOO_MANY_ELEMENTS(PROJECT_OPUS_NS_HOME, _PT("info")));
return false;
}
@@ -184,8 +184,8 @@
case 2:
// One info minimum
if (this->d->firstInfo) {
- handleError(SPIFF_READER_ERROR_ELEMENT_MISSING,
- SPIFF_READER_TEXT_ZERO_ELEMENT_MISSING(PROJECT_OPUS_NS_HOME, _PT("info")));
+ handleError(XSPF_READER_ERROR_ELEMENT_MISSING,
+ XSPF_READER_TEXT_ZERO_ELEMENT_MISSING(PROJECT_OPUS_NS_HOME, _PT("info")));
return false;
}
break;
@@ -224,7 +224,7 @@
} else if (!::PORT_STRCMP(atts[i + 1], _PT("playlist"))) {
dummyType = TYPE_PLAYLIST;
} else {
- handleError(SPIFF_READER_ERROR_ATTRIBUTE_INVALID,
+ handleError(XSPF_READER_ERROR_ATTRIBUTE_INVALID,
PROJECT_OPUS_TEXT_ZERO_ATTRIBUTE_OUT_OF_SET(_PT("type"), _PT("{'album', 'playlist'}")));
return false;
}
@@ -233,8 +233,8 @@
} else if (!::PORT_STRCMP(atts[i], _PT("nid"))) {
int dummyNid;
if (!Toolbox::extractInteger(atts[i + 1], 0, &dummyNid)) {
- handleError(SPIFF_READER_ERROR_ATTRIBUTE_INVALID,
- SPIFF_READER_TEXT_ZERO_WRONG_ATTRIBUTE_TYPE(_PT("nid"), _PT("unsigned integer")));
+ handleError(XSPF_READER_ERROR_ATTRIBUTE_INVALID,
+ XSPF_READER_TEXT_ZERO_WRONG_ATTRIBUTE_TYPE(_PT("nid"), _PT("unsigned integer")));
return false;
}
this->d->extension.setNodeId(dummyNid);
@@ -246,21 +246,21 @@
return false;
}
} else {
- handleError(SPIFF_READER_ERROR_ATTRIBUTE_FORBIDDEN,
- SPIFF_READER_TEXT_ONE_ATTRIBUTE_FORBIDDEN, atts[i]);
+ handleError(XSPF_READER_ERROR_ATTRIBUTE_FORBIDDEN,
+ XSPF_READER_TEXT_ONE_ATTRIBUTE_FORBIDDEN, atts[i]);
return false;
}
}
if (!typeFound) {
- handleError(SPIFF_READER_ERROR_ATTRIBUTE_MISSING,
- SPIFF_READER_TEXT_ZERO_ATTRIBUTE_MISSING(_PT("type")));
+ handleError(XSPF_READER_ERROR_ATTRIBUTE_MISSING,
+ XSPF_READER_TEXT_ZERO_ATTRIBUTE_MISSING(_PT("type")));
return false;
}
if (!nidFound) {
- handleError(SPIFF_READER_ERROR_ATTRIBUTE_MISSING,
- SPIFF_READER_TEXT_ZERO_ATTRIBUTE_MISSING(_PT("nid")));
+ handleError(XSPF_READER_ERROR_ATTRIBUTE_MISSING,
+ XSPF_READER_TEXT_ZERO_ATTRIBUTE_MISSING(_PT("nid")));
return false;
}
Modified: trunk/src/XspfDataWriter.h
===================================================================
--- trunk/src/XspfDataWriter.h 2009-02-17 20:56:50 UTC (rev 514)
+++ trunk/src/XspfDataWriter.h 2009-02-17 21:08:45 UTC (rev 515)
@@ -43,8 +43,8 @@
* Interface of SpiffDataWriter.
*/
-#ifndef SPIFF_DATA_WRITER_H
-#define SPIFF_DATA_WRITER_H
+#ifndef XSPF_DATA_WRITER_H
+#define XSPF_DATA_WRITER_H
#include <spiff/SpiffDefines.h>
@@ -193,4 +193,4 @@
}
-#endif // SPIFF_DATA_WRITER_H
+#endif // XSPF_DATA_WRITER_H
Modified: trunk/src/XspfIndentFormatter.cpp
===================================================================
--- trunk/src/XspfIndentFormatter.cpp 2009-02-17 20:56:50 UTC (rev 514)
+++ trunk/src/XspfIndentFormatter.cpp 2009-02-17 21:08:45 UTC (rev 515)
@@ -53,10 +53,10 @@
* Specifies the type of basic XML unit.
*/
enum SpiffElemPos {
- SPIFF_ELEM_DUMMY, ///< Stack returns 0 if empty
+ XSPF_ELEM_DUMMY, ///< Stack returns 0 if empty
- SPIFF_ELEM_START, ///< Opening tag
- SPIFF_ELEM_BODY ///< Tag body
+ XSPF_ELEM_START, ///< Opening tag
+ XSPF_ELEM_BODY ///< Tag body
};
@@ -159,13 +159,13 @@
*this->getOutput() << _PT(">");
this->d->level++;
- this->d->stack.push(SPIFF_ELEM_START);
+ this->d->stack.push(XSPF_ELEM_START);
}
void SpiffIndentFormatter::writeEnd(XML_Char const * name) {
this->d->level--;
- if (this->d->stack.top() != SPIFF_ELEM_BODY) {
+ if (this->d->stack.top() != XSPF_ELEM_BODY) {
*this->getOutput() << _PT('\n');
for (int i = -(this->d->shift); i < this->d->level; i++) {
*this->getOutput() << _PT('\t');
@@ -187,13 +187,13 @@
void SpiffIndentFormatter::writeBody(XML_Char const * text) {
writeCharacterData(text);
- this->d->stack.push(SPIFF_ELEM_BODY);
+ this->d->stack.push(XSPF_ELEM_BODY);
}
void SpiffIndentFormatter::writeBody(int number) {
*this->getOutput() << number;
- this->d->stack.push(SPIFF_ELEM_BODY);
+ this->d->stack.push(XSPF_ELEM_BODY);
}
Modified: trunk/src/XspfPropsWriter.h
===================================================================
--- trunk/src/XspfPropsWriter.h 2009-02-17 20:56:50 UTC (rev 514)
+++ trunk/src/XspfPropsWriter.h 2009-02-17 21:08:45 UTC (rev 515)
@@ -43,8 +43,8 @@
* Interface of SpiffPropsWriter.
*/
-#ifndef SPIFF_PROPS_WRITER_H
-#define SPIFF_PROPS_WRITER_H
+#ifndef XSPF_PROPS_WRITER_H
+#define XSPF_PROPS_WRITER_H
#include "SpiffDataWriter.h"
@@ -196,4 +196,4 @@
}
-#endif // SPIFF_PROPS_WRITER_H
+#endif // XSPF_PROPS_WRITER_H
Modified: trunk/src/XspfReader.cpp
===================================================================
--- trunk/src/XspfReader.cpp 2009-02-17 20:56:50 UTC (rev 514)
+++ trunk/src/XspfReader.cpp 2009-02-17 21:08:45 UTC (rev 515)
@@ -211,7 +211,7 @@
ownCallback(false),
extensionReader(NULL),
extensionReaderFactory(handlerFactory),
- errorCode(SPIFF_READER_SUCCESS),
+ errorCode(XSPF_READER_SUCCESS),
insideExtension(false),
skip(false),
skipStopLevel(0),
@@ -488,7 +488,7 @@
// Init base URI stack
if (!Toolbox::isAbsoluteUri(baseUri)) {
- handleFatalError(SPIFF_READER_ERROR_BASE_URI_USELESS,
+ handleFatalError(XSPF_READER_ERROR_BASE_URI_USELESS,
_PT("Base URI is not a valid absolute URI."));
return false;
}
@@ -498,7 +498,7 @@
clearError();
// Create parser
- this->d->parser = ::XML_ParserCreateNS(NULL, SPIFF_NS_SEP_CHAR);
+ this->d->parser = ::XML_ParserCreateNS(NULL, XSPF_NS_SEP_CHAR);
// Put class pointer into user data
::XML_SetUserData(this->d->parser, this);
@@ -530,8 +530,8 @@
SpiffReader::handleXmlBaseAttribute(XML_Char const * xmlBase) {
// Check URI
if (!Toolbox::isUri(xmlBase)) {
- if (!handleError(SPIFF_READER_ERROR_ATTRIBUTE_INVALID,
- SPIFF_READER_TEXT_ZERO_WRONG_ATTRIBUTE_TYPE(
+ if (!handleError(XSPF_READER_ERROR_ATTRIBUTE_INVALID,
+ XSPF_READER_TEXT_ZERO_WRONG_ATTRIBUTE_TYPE(
_PT("xml:base"), _PT("URI")))) {
return false;
}
@@ -559,8 +559,8 @@
void SpiffReader::setExpatError() {
XML_Error const expatCode = ::XML_GetErrorCode(this->d->parser);
- handleFatalError(SPIFF_READER_ERROR_EXPAT + static_cast<int>(expatCode),
- SPIFF_READER_TEXT_ONE_EXPAT_ERROR,
+ handleFatalError(XSPF_READER_ERROR_EXPAT + static_cast<int>(expatCode),
+ XSPF_READER_TEXT_ONE_EXPAT_ERROR,
::XML_ErrorString(expatCode));
}
@@ -574,15 +574,15 @@
// Check filename
if (filename == NULL) {
- handleFatalError(SPIFF_READER_ERROR_NO_INPUT,
- SPIFF_READER_TEXT_ZERO_FILENAME_NULL);
+ handleFatalError(XSPF_READER_ERROR_NO_INPUT,
+ XSPF_READER_TEXT_ZERO_FILENAME_NULL);
return this->d->errorCode;
}
// Open file
FILE * file = ::PORT_FOPEN(filename, _PT("r"));
if (file == NULL) {
- handleFatalError(SPIFF_READER_ERROR_NO_INPUT, SPIFF_READER_TEXT_ONE_FILE_READING_ERROR, filename);
+ handleFatalError(XSPF_READER_ERROR_NO_INPUT, XSPF_READER_TEXT_ONE_FILE_READING_ERROR, filename);
return this->d->errorCode;
}
@@ -593,17 +593,17 @@
// Read and parse file
void * buffer;
- if (filesize > SPIFF_MAX_BLOCK_SIZE) {
+ if (filesize > XSPF_MAX_BLOCK_SIZE) {
// In several blocks
long sizeLeft = filesize;
while (sizeLeft > 0) {
- long const blockSize = std::min<long>(sizeLeft, SPIFF_MAX_BLOCK_SIZE);
+ long const blockSize = std::min<long>(sizeLeft, XSPF_MAX_BLOCK_SIZE);
buffer = ::XML_GetBuffer(this->d->parser, blockSize);
::fread(buffer, 1, blockSize, file);
sizeLeft -= blockSize;
if (::XML_ParseBuffer(this->d->parser, blockSize, sizeLeft == 0)
== XML_STATUS_ERROR) {
- if (this->d->errorCode == SPIFF_READER_SUCCESS) {
+ if (this->d->errorCode == XSPF_READER_SUCCESS) {
setExpatError();
}
break;
@@ -618,7 +618,7 @@
if (::XML_ParseBuffer(this->d->parser, filesize, 1)
== XML_STATUS_ERROR) {
- if (this->d->errorCode == SPIFF_READER_SUCCESS) {
+ if (this->d->errorCode == XSPF_READER_SUCCESS) {
setExpatError();
}
}
@@ -643,7 +643,7 @@
// Parse
if (::XML_Parse(this->d->parser, memory, numBytes, 1)
== XML_STATUS_ERROR) {
- if (this->d->errorCode == SPIFF_READER_SUCCESS) {
+ if (this->d->errorCode == XSPF_READER_SUCCESS) {
setExpatError();
}
}
@@ -681,7 +681,7 @@
if (::XML_ParseBuffer(this->d->parser, bytesToParse,
bytesToParse == 0) == XML_STATUS_ERROR) {
// Error
- if (this->d->errorCode == SPIFF_READER_SUCCESS) {
+ if (this->d->errorCode == XSPF_READER_SUCCESS) {
setExpatError();
}
break;
@@ -705,9 +705,9 @@
bool
SpiffReader::checkAndSkipNamespace(XML_Char const * fullName,
XML_Char const * & localName) {
- if (::PORT_STRNCMP(fullName, SPIFF_NS_HOME, SPIFF_NS_HOME_LEN)) {
- if (!handleError(SPIFF_READER_ERROR_ELEMENT_FORBIDDEN,
- SPIFF_READER_TEXT_ONE_ELEMENT_FORBIDDEN,
+ if (::PORT_STRNCMP(fullName, XSPF_NS_HOME, XSPF_NS_HOME_LEN)) {
+ if (!handleError(XSPF_READER_ERROR_ELEMENT_FORBIDDEN,
+ XSPF_READER_TEXT_ONE_ELEMENT_FORBIDDEN,
fullName)) {
return false;
}
@@ -715,7 +715,7 @@
// Catch <xspf:tag> as <tag> instead
localName = fullName;
while ((localName[0] != _PT('\0'))
- && (localName[0] != SPIFF_NS_SEP_CHAR)) {
+ && (localName[0] != XSPF_NS_SEP_CHAR)) {
localName++;
}
if (localName[0] == _PT('\0')) {
@@ -726,7 +726,7 @@
localName++;
}
} else {
- localName = fullName + SPIFF_NS_HOME_LEN + 1;
+ localName = fullName + XSPF_NS_HOME_LEN + 1;
}
return true;
}
@@ -742,8 +742,8 @@
// Check root name
if (::PORT_STRCMP(localName, _PT("playlist"))) {
- if (!handleError(SPIFF_READER_ERROR_ELEMENT_FORBIDDEN,
- SPIFF_READER_TEXT_ONE_WRONG_ROOT_NAME,
+ if (!handleError(XSPF_READER_ERROR_ELEMENT_FORBIDDEN,
+ XSPF_READER_TEXT_ONE_WRONG_ROOT_NAME,
fullName)) {
return false;
}
@@ -780,9 +780,9 @@
if (this->d->firstPlaylistAnnotation) {
this->d->firstPlaylistAnnotation = false;
} else {
- if (!handleError(SPIFF_READER_ERROR_ELEMENT_TOOMANY,
- SPIFF_READER_TEXT_ZERO_TOO_MANY_ELEMENTS(
- SPIFF_NS_HOME, _PT("annotation")))) {
+ if (!handleError(XSPF_READER_ERROR_ELEMENT_TOOMANY,
+ XSPF_READER_TEXT_ZERO_TOO_MANY_ELEMENTS(
+ XSPF_NS_HOME, _PT("annotation")))) {
return false;
}
}
@@ -803,9 +803,9 @@
if (this->d->firstPlaylistAttribution) {
this->d->firstPlaylistAttribution = false;
} else {
- if (!handleError(SPIFF_READER_ERROR_ELEMENT_TOOMANY,
- SPIFF_READER_TEXT_ZERO_TOO_MANY_ELEMENTS(
- SPIFF_NS_HOME, _PT("attribution")))) {
+ if (!handleError(XSPF_READER_ERROR_ELEMENT_TOOMANY,
+ XSPF_READER_TEXT_ZERO_TOO_MANY_ELEMENTS(
+ XSPF_NS_HOME, _PT("attribution")))) {
return false;
}
}
@@ -829,9 +829,9 @@
if (this->d->firstPlaylistCreator) {
this->d->firstPlaylistCreator = false;
} else {
- if (!handleError(SPIFF_READER_ERROR_ELEMENT_TOOMANY,
- SPIFF_READER_TEXT_ZERO_TOO_MANY_ELEMENTS(
- SPIFF_NS_HOME, _PT("creator")))) {
+ if (!handleError(XSPF_READER_ERROR_ELEMENT_TOOMANY,
+ XSPF_READER_TEXT_ZERO_TOO_MANY_ELEMENTS(
+ XSPF_NS_HOME, _PT("creator")))) {
return false;
}
}
@@ -852,9 +852,9 @@
if (this->d->firstPlaylistDate) {
this->d->firstPlaylistDate = false;
} else {
- if (!handleError(SPIFF_READER_ERROR_ELEMENT_TOOMANY,
- SPIFF_READER_TEXT_ZERO_TOO_MANY_ELEMENTS(
- SPIFF_NS_HOME, _PT("date")))) {
+ if (!handleError(XSPF_READER_ERROR_ELEMENT_TOOMANY,
+ XSPF_READER_TEXT_ZERO_TOO_MANY_ELEMENTS(
+ XSPF_NS_HOME, _PT("date")))) {
return false;
}
}
@@ -874,8 +874,8 @@
// Tag only allowed in v1
if (this->d->version == 0) {
- if (!handleError(SPIFF_READER_ERROR_ELEMENT_FORBIDDEN,
- SPIFF_READER_TEXT_ONE_ELEMENT_FORBIDDEN_VERSION_ZERO,
+ if (!handleError(XSPF_READER_ERROR_ELEMENT_FORBIDDEN,
+ XSPF_READER_TEXT_ONE_ELEMENT_FORBIDDEN_VERSION_ZERO,
fullName)) {
return false;
}
@@ -916,9 +916,9 @@
if (this->d->firstPlaylistIdentifier) {
this->d->firstPlaylistIdentifier = false;
} else {
- if (!handleError(SPIFF_READER_ERROR_ELEMENT_TOOMANY,
- SPIFF_READER_TEXT_ZERO_TOO_MANY_ELEMENTS(
- SPIFF_NS_HOME, _PT("identifier")))) {
+ if (!handleError(XSPF_READER_ERROR_ELEMENT_TOOMANY,
+ XSPF_READER_TEXT_ZERO_TOO_MANY_ELEMENTS(
+ XSPF_NS_HOME, _PT("identifier")))) {
return false;
}
}
@@ -939,9 +939,9 @@
if (this->d->firstPlaylistImage) {
this->d->firstPlaylistImage = false;
} else {
- if (!handleError(SPIFF_READER_ERROR_ELEMENT_TOOMANY,
- SPIFF_READER_TEXT_ZERO_TOO_MANY_ELEMENTS(
- SPIFF_NS_HOME, _PT("image")))) {
+ if (!handleError(XSPF_READER_ERROR_ELEMENT_TOOMANY,
+ XSPF_READER_TEXT_ZERO_TOO_MANY_ELEMENTS(
+ XSPF_NS_HOME, _PT("image")))) {
return false;
}
}
@@ -962,9 +962,9 @@
if (this->d->firstPlaylistInfo) {
this->d->firstPlaylistInfo = false;
} else {
- if (!handleError(SPIFF_READER_ERROR_ELEMENT_TOOMANY,
- SPIFF_READER_TEXT_ZERO_TOO_MANY_ELEMENTS(
- SPIFF_NS_HOME, _PT("info")))) {
+ if (!handleError(XSPF_READER_ERROR_ELEMENT_TOOMANY,
+ XSPF_READER_TEXT_ZERO_TOO_MANY_ELEMENTS(
+ XSPF_NS_HOME, _PT("info")))) {
return false;
}
}
@@ -992,9 +992,9 @@
if (this->d->firstPlaylistLicense) {
this->d->firstPlaylistLicense = false;
} else {
- if (!handleError(SPIFF_READER_ERROR_ELEMENT_TOOMANY,
- SPIFF_READER_TEXT_ZERO_TOO_MANY_ELEMENTS(
- SPIFF_NS_HOME, _PT("license")))) {
+ if (!handleError(XSPF_READER_ERROR_ELEMENT_TOOMANY,
+ XSPF_READER_TEXT_ZERO_TOO_MANY_ELEMENTS(
+ XSPF_NS_HOME, _PT("license")))) {
return false;
}
}
@@ -1039,9 +1039,9 @@
if (this->d->firstPlaylistLocation) {
this->d->firstPlaylistLocation = false;
} else {
- if (!handleError(SPIFF_READER_ERROR_ELEMENT_TOOMANY,
- SPIFF_READER_TEXT_ZERO_TOO_MANY_ELEMENTS(
- SPIFF_NS_HOME, _PT("location")))) {
+ if (!handleError(XSPF_READER_ERROR_ELEMENT_TOOMANY,
+ XSPF_READER_TEXT_ZERO_TOO_MANY_ELEMENTS(
+ XSPF_NS_HOME, _PT("location")))) {
return false;
}
}
@@ -1088,9 +1088,9 @@
if (this->d->firstPlaylistTitle) {
this->d->firstPlaylistTitle = false;
} else {
- if (!handleError(SPIFF_READER_ERROR_ELEMENT_TOOMANY,
- SPIFF_READER_TEXT_ZERO_TOO_MANY_ELEMENTS(
- SPIFF_NS_HOME, _PT("title")))) {
+ if (!handleError(XSPF_READER_ERROR_ELEMENT_TOOMANY,
+ XSPF_READER_TEXT_ZERO_TOO_MANY_ELEMENTS(
+ XSPF_NS_HOME, _PT("title")))) {
return false;
}
}
@@ -1111,9 +1111,9 @@
if (this->d->firstPlaylistTrackList) {
this->d->firstPlaylistTrackList = false;
} else {
- if (!handleError(SPIFF_READER_ERROR_ELEMENT_TOOMANY,
- SPIFF_READER_TEXT_ZERO_TOO_MANY_ELEMENTS(
- SPIFF_NS_HOME, _PT("trackList")))) {
+ if (!handleError(XSPF_READER_ERROR_ELEMENT_TOOMANY,
+ XSPF_READER_TEXT_ZERO_TOO_MANY_ELEMENTS(
+ XSPF_NS_HOME, _PT("trackList")))) {
return false;
}
}
@@ -1131,8 +1131,8 @@
}
- if (!handleError(SPIFF_READER_ERROR_ELEMENT_FORBIDDEN,
- SPIFF_READER_TEXT_ONE_ELEMENT_FORBIDDEN,
+ if (!handleError(XSPF_READER_ERROR_ELEMENT_FORBIDDEN,
+ XSPF_READER_TEXT_ONE_ELEMENT_FORBIDDEN,
fullName)) {
return false;
}
@@ -1190,8 +1190,8 @@
}
- if (!handleError(SPIFF_READER_ERROR_ELEMENT_FORBIDDEN,
- SPIFF_READER_TEXT_ONE_ELEMENT_FORBIDDEN,
+ if (!handleError(XSPF_READER_ERROR_ELEMENT_FORBIDDEN,
+ XSPF_READER_TEXT_ONE_ELEMENT_FORBIDDEN,
fullName)) {
return false;
}
@@ -1224,9 +1224,9 @@
if (this->d->firstTrackAlbum) {
this->d->firstTrackAlbum = false;
} else {
- if (!handleError(SPIFF_READER_ERROR_ELEMENT_TOOMANY,
- SPIFF_READER_TEXT_ZERO_TOO_MANY_ELEMENTS(
- SPIFF_NS_HOME, _PT("album")))) {
+ if (!handleError(XSPF_READER_ERROR_ELEMENT_TOOMANY,
+ XSPF_READER_TEXT_ZERO_TOO_MANY_ELEMENTS(
+ XSPF_NS_HOME, _PT("album")))) {
return false;
}
}
@@ -1247,9 +1247,9 @@
if (this->d->firstTrackAnnotation) {
this->d->firstTrackAnnotation = false;
} else {
- if (!handleError(SPIFF_READER_ERROR_ELEMENT_TOOMANY,
- SPIFF_READER_TEXT_ZERO_TOO_MANY_ELEMENTS(
- SPIFF_NS_HOME, _PT("annotation")))) {
+ if (!handleError(XSPF_READER_ERROR_ELEMENT_TOOMANY,
+ XSPF_READER_TEXT_ZERO_TOO_MANY_ELEMENTS(
+ XSPF_NS_HOME, _PT("annotation")))) {
return false;
}
}
@@ -1269,8 +1269,8 @@
// Note: Element //playlist/trackList/track/artist
// is not valid XSPF. This is a loose fallback.
- if (!handleError(SPIFF_READER_ERROR_ELEMENT_FORBIDDEN,
- SPIFF_READER_TEXT_ONE_ELEMENT_FORBIDDEN,
+ if (!handleError(XSPF_READER_ERROR_ELEMENT_FORBIDDEN,
+ XSPF_READER_TEXT_ONE_ELEMENT_FORBIDDEN,
fullName)) {
return false;
}
@@ -1294,9 +1294,9 @@
if (this->d->firstTrackCreator) {
this->d->firstTrackCreator = false;
} else {
- if (!handleError(SPIFF_READER_ERROR_ELEMENT_TOOMANY,
- SPIFF_READER_TEXT_ZERO_TOO_MANY_ELEMENTS(
- SPIFF_NS_HOME, _PT("creator")))) {
+ if (!handleError(XSPF_READER_ERROR_ELEMENT_TOOMANY,
+ XSPF_READER_TEXT_ZERO_TOO_MANY_ELEMENTS(
+ XSPF_NS_HOME, _PT("creator")))) {
return false;
}
}
@@ -1317,9 +1317,9 @@
if (this->d->firstTrackDuration) {
this->d->firstTrackDuration = false;
} else {
- if (!handleError(SPIFF_READER_ERROR_ELEMENT_TOOMANY,
- SPIFF_READER_TEXT_ZERO_TOO_MANY_ELEMENTS(
- SPIFF_NS_HOME, _PT("duration")))) {
+ if (!handleError(XSPF_READER_ERROR_ELEMENT_TOOMANY,
+ XSPF_READER_TEXT_ZERO_TOO_MANY_ELEMENTS(
+ XSPF_NS_HOME, _PT("duration")))) {
return false;
}
}
@@ -1339,8 +1339,8 @@
// Tag only allowed in v1
if (this->d->version == 0) {
- if (!handleError(SPIFF_READER_ERROR_ELEMENT_FORBIDDEN,
- SPIFF_READER_TEXT_ONE_ELEMENT_FORBIDDEN_VERSION_ZERO,
+ if (!handleError(XSPF_READER_ERROR_ELEMENT_FORBIDDEN,
+ XSPF_READER_TEXT_ONE_ELEMENT_FORBIDDEN_VERSION_ZERO,
fullName)) {
return false;
}
@@ -1392,9 +1392,9 @@
if (this->d->firstTrackImage) {
this->d->firstTrackImage = false;
} else {
- if (!handleError(SPIFF_READER_ERROR_ELEMENT_TOOMANY,
- SPIFF_READER_TEXT_ZERO_TOO_MANY_ELEMENTS(
- SPIFF_NS_HOME, _PT("image")))) {
+ if (!handleError(XSPF_READER_ERROR_ELEMENT_TOOMANY,
+ XSPF_READER_TEXT_ZERO_TOO_MANY_ELEMENTS(
+ XSPF_NS_HOME, _PT("image")))) {
return false;
}
}
@@ -1415,9 +1415,9 @@
if (this->d->firstTrackInfo) {
this->d->firstTrackInfo = false;
} else {
- if (!handleError(SPIFF_READER_ERROR_ELEMENT_TOOMANY,
- SPIFF_READER_TEXT_ZERO_TOO_MANY_ELEMENTS(
- SPIFF_NS_HOME, _PT("info")))) {
+ if (!handleError(XSPF_READER_ERROR_ELEMENT_TOOMANY,
+ XSPF_READER_TEXT_ZERO_TOO_MANY_ELEMENTS(
+ XSPF_NS_HOME, _PT("info")))) {
return false;
}
}
@@ -1500,9 +1500,9 @@
if (this->d->firstTrackTitle) {
this->d->firstTrackTitle = false;
} else {
- if (!handleError(SPIFF_READER_ERROR_ELEMENT_TOOMANY,
- SPIFF_READER_TEXT_ZERO_TOO_MANY_ELEMENTS(
- SPIFF_NS_HOME, _PT("title")))) {
+ if (!handleError(XSPF_READER_ERROR_ELEMENT_TOOMANY,
+ XSPF_READER_TEXT_ZERO_TOO_MANY_ELEMENTS(
+ XSPF_NS_HOME, _PT("title")))) {
return false;
}
}
@@ -1523,9 +1523,9 @@
if (this->d->firstTrackTrackNum) {
this->d->firstTrackTrackNum = false;
} else {
- if (!handleError(SPIFF_READER_ERROR_ELEMENT_TOOMANY,
- SPIFF_READER_TEXT_ZERO_TOO_MANY_ELEMENTS(
- SPIFF_NS_HOME, _PT("trackNum")))) {
+ if (!handleError(XSPF_READER_ERROR_ELEMENT_TOOMANY,
+ XSPF_READER_TEXT_ZERO_TOO_MANY_ELEMENTS(
+ XSPF_NS_HOME, _PT("trackNum")))) {
return false;
}
}
@@ -1543,8 +1543,8 @@
}
- if (!handleError(SPIFF_READER_ERROR_ELEMENT_FORBIDDEN,
- SPIFF_READER_TEXT_ONE_ELEMENT_FORBIDDEN,
+ if (!handleError(XSPF_READER_ERROR_ELEMENT_FORBIDDEN,
+ XSPF_READER_TEXT_ONE_ELEMENT_FORBIDDEN,
fullName)) {
...
[truncated message content] |
|
From: <har...@us...> - 2009-02-17 20:56:56
|
Revision: 514
http://libspiff.svn.sourceforge.net/libspiff/?rev=514&view=rev
Author: hartwork
Date: 2009-02-17 20:56:50 +0000 (Tue, 17 Feb 2009)
Log Message:
-----------
Rename libSpiff to libxspf - step 2.1: string replace "libSpiff" to "libxspf" except in ChangeLog
Modified Paths:
--------------
trunk/BUGS
trunk/COPYING
trunk/README
trunk/bindings/c/xspf_c.cpp
trunk/bindings/c/xspf_c.h
trunk/configure.ac
trunk/doc/Doxyfile.in
trunk/doc/Mainpage
trunk/examples/check/check.cpp
trunk/examples/read/read.cpp
trunk/examples/strip/strip.cpp
trunk/examples/write/write.cpp
trunk/include/xspf/ProjectOpus/ProjectOpusPlaylistExtension.h
trunk/include/xspf/ProjectOpus/ProjectOpusPlaylistExtensionReader.h
trunk/include/xspf/ProjectOpus/ProjectOpusPlaylistExtensionWriter.h
trunk/include/xspf/Xspf.h
trunk/include/xspf/XspfChunkCallback.h
trunk/include/xspf/XspfData.h
trunk/include/xspf/XspfDateTime.h
trunk/include/xspf/XspfDefines.h
trunk/include/xspf/XspfExtension.h
trunk/include/xspf/XspfExtensionReader.h
trunk/include/xspf/XspfExtensionReaderFactory.h
trunk/include/xspf/XspfExtensionWriter.h
trunk/include/xspf/XspfIndentFormatter.h
trunk/include/xspf/XspfProps.h
trunk/include/xspf/XspfReader.h
trunk/include/xspf/XspfReaderCallback.h
trunk/include/xspf/XspfSeamlessFormatter.h
trunk/include/xspf/XspfStack.h
trunk/include/xspf/XspfToolbox.h
trunk/include/xspf/XspfTrack.h
trunk/include/xspf/XspfVersion.h
trunk/include/xspf/XspfWriter.h
trunk/include/xspf/XspfXmlFormatter.h
trunk/include/xspf/ZirkorosOnline/ZirkorosOnlineTrackExtension.h
trunk/include/xspf/ZirkorosOnline/ZirkorosOnlineTrackExtensionReader.h
trunk/include/xspf/ZirkorosOnline/ZirkorosOnlineTrackExtensionWriter.h
trunk/src/ProjectOpus/ProjectOpusPlaylistExtension.cpp
trunk/src/ProjectOpus/ProjectOpusPlaylistExtensionReader.cpp
trunk/src/ProjectOpus/ProjectOpusPlaylistExtensionWriter.cpp
trunk/src/XspfChunkCallback.cpp
trunk/src/XspfData.cpp
trunk/src/XspfDataWriter.cpp
trunk/src/XspfDataWriter.h
trunk/src/XspfDateTime.cpp
trunk/src/XspfExtension.cpp
trunk/src/XspfExtensionReader.cpp
trunk/src/XspfExtensionReaderFactory.cpp
trunk/src/XspfExtensionWriter.cpp
trunk/src/XspfIndentFormatter.cpp
trunk/src/XspfProps.cpp
trunk/src/XspfPropsWriter.cpp
trunk/src/XspfPropsWriter.h
trunk/src/XspfReader.cpp
trunk/src/XspfReaderCallback.cpp
trunk/src/XspfSeamlessFormatter.cpp
trunk/src/XspfSkipExtensionReader.cpp
trunk/src/XspfSkipExtensionReader.h
trunk/src/XspfStrictReaderCallback.cpp
trunk/src/XspfStrictReaderCallback.h
trunk/src/XspfToolbox.cpp
trunk/src/XspfTrack.cpp
trunk/src/XspfTrackWriter.cpp
trunk/src/XspfTrackWriter.h
trunk/src/XspfWriter.cpp
trunk/src/XspfXmlFormatter.cpp
trunk/src/ZirkorosOnline/ZirkorosOnlineTrackExtension.cpp
trunk/src/ZirkorosOnline/ZirkorosOnlineTrackExtensionReader.cpp
trunk/src/ZirkorosOnline/ZirkorosOnlineTrackExtensionWriter.cpp
trunk/test/ChunkCallbackSuite.cpp
trunk/test/ChunkCallbackSuite.h
trunk/test/DateTimeSuite.cpp
trunk/test/DateTimeSuite.h
trunk/test/ExtensionReaderFactorySuite.cpp
trunk/test/ExtensionReaderFactorySuite.h
trunk/test/MaliciousXmlSuite.cpp
trunk/test/MaliciousXmlSuite.h
trunk/test/MemoryModelSuite.cpp
trunk/test/MemoryModelSuite.h
trunk/test/OfficialSuite.cpp
trunk/test/OfficialSuite.h
trunk/test/ProjectOpus/ProjectOpusSuite.cpp
trunk/test/ProjectOpus/ProjectOpusSuite.h
trunk/test/ReadWriteSuite.cpp
trunk/test/ReadWriteSuite.h
trunk/test/WhiteSpaceSuite.cpp
trunk/test/WhiteSpaceSuite.h
trunk/test/ZirkorosOnline/ZirkorosOnlineSuite.cpp
trunk/test/ZirkorosOnline/ZirkorosOnlineSuite.h
trunk/test/test.cpp
Modified: trunk/BUGS
===================================================================
--- trunk/BUGS 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/BUGS 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,3 +1,3 @@
- For XSPF-0 <date> contains ISO 8601 content instead.
- libSpiff incorrectly requires xsd:dateTime instead
+ libxspf incorrectly requires xsd:dateTime instead
as with XPSF-1
Modified: trunk/COPYING
===================================================================
--- trunk/COPYING 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/COPYING 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,4 +1,4 @@
-libSpiff - XSPF playlist handling library
+libxspf - XSPF playlist handling library
Copyright (C) 2007, Sebastian Pipping / Xiph.Org Foundation
All rights reserved.
Modified: trunk/README
===================================================================
--- trunk/README 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/README 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
== About ==
-libSpiff is a C++ library that can help your application
+libxspf is a C++ library that can help your application
to read and write XSPF playlist files (both Version 0 and 1).
Since version 0.6.0rc1 the library itself is licensed under
the new BSD license. The code of the test suite (files "test/*")
@@ -9,7 +9,7 @@
reader and writer properly. You can also create API documentation
using Doxygen; this API documentation also contains a tutorial.
Don't hesitate to contact me if you have questions on
-integrating libSpiff into your application.
+integrating libxspf into your application.
== Author ==
Modified: trunk/bindings/c/xspf_c.cpp
===================================================================
--- trunk/bindings/c/xspf_c.cpp 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/bindings/c/xspf_c.cpp 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * spiff_c - Simple C interface for libSpiff
+ * spiff_c - Simple C interface for libxspf
*
* Copyright (C) 2007, Ed Schouten / Xiph.Org Foundation
* Copyright (C) 2008, Sebastian Pipping / Xiph.Org Foundation
@@ -41,7 +41,7 @@
*/
/**
* @file spiff_c.cpp
- * @brief Simple libSpiff C bindings.
+ * @brief Simple libxspf C bindings.
*/
#include <spiff/SpiffIndentFormatter.h>
Modified: trunk/bindings/c/xspf_c.h
===================================================================
--- trunk/bindings/c/xspf_c.h 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/bindings/c/xspf_c.h 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * spiff_c - Simple C interface for libSpiff
+ * spiff_c - Simple C interface for libxspf
*
* Copyright (C) 2007, Ed Schouten / Xiph.Org Foundation
* Copyright (C) 2008, Sebastian Pipping / Xiph.Org Foundation
@@ -41,7 +41,7 @@
*/
/**
* @file spiff_c.h
- * @brief Simple libSpiff C bindings.
+ * @brief Simple libxspf C bindings.
*/
#ifndef SPIFF_C_H
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/configure.ac 2009-02-17 20:56:50 UTC (rev 514)
@@ -97,7 +97,7 @@
# Local headers must come very first. Otherwise we
# risk including headers of an already installed
-# libSpiff version if its path is in CPPFLAGS
+# libxspf version if its path is in CPPFLAGS
CPPFLAGS="-I${srcdir}/include ${CPPFLAGS}"
Modified: trunk/doc/Doxyfile.in
===================================================================
--- trunk/doc/Doxyfile.in 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/doc/Doxyfile.in 2009-02-17 20:56:50 UTC (rev 514)
@@ -15,7 +15,7 @@
###############################################################
-PROJECT_NAME = libSpiff
+PROJECT_NAME = libxspf
# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by double-quotes) that should identify the project for which the documentation is generated. This name is used in the title of most generated pages and in a few other places.
Modified: trunk/doc/Mainpage
===================================================================
--- trunk/doc/Mainpage 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/doc/Mainpage 2009-02-17 20:56:50 UTC (rev 514)
@@ -9,12 +9,12 @@
*
*
* @section SEC_INTRO Introduction
- * Welcome to the short libSpiff integration tutorial.
+ * Welcome to the short libxspf integration tutorial.
* I recommend using this tutorial together with the
* code samples in the <c>examples</c> folder; one
* of these two sources is likely to answer your questions.
* Please drop me a line if you need further assistance.
- * Good luck with integrating libSpiff.
+ * Good luck with integrating libxspf.
*
* @section SEC_READING Reading a playlist
* To read an XSPF playlist you first need a reader instance:
@@ -101,7 +101,7 @@
* The first parameter is an XML formatter
* (an instance of a class derived from SpiffXmlFormatter)
* which will mainly control the whitespace in the XML output.
- * libSpiff already comes with two built-in formatters:
+ * libxspf already comes with two built-in formatters:
* SpiffIndentFormatter which creates well-indented XML output
* and SpiffSeamlessFormatter which does not create any whitespace at all.
* The second parameter is the base URI used to shorten URIs where possible.
@@ -171,7 +171,7 @@
*
*
* @section SEC_MALICIOUS Handling malicious XML
- * Let us assume you are using libSpiff to power some kind of web service with XSPF
+ * Let us assume you are using libxspf to power some kind of web service with XSPF
* reading cabilities. Let us further assume this service can accept XSPF input
* from a user. Due to the nature of XML your service would be vulnerable to
* an <i>XML entity explosion attack</i>. What this means is that a rather small
@@ -199,7 +199,7 @@
* </playlist>
* @endcode
*
- * With malicious XML detection enabled, libSpiff sets certain limits
+ * With malicious XML detection enabled, libxspf sets certain limits
* to the values of entities. Currently these limits are:
* - Length of entity values
* - Sum of lookups per entity value
Modified: trunk/examples/check/check.cpp
===================================================================
--- trunk/examples/check/check.cpp 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/examples/check/check.cpp 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
@@ -115,7 +115,7 @@
<< std::endl << std::flush;
} else if (loose && !fatal) {
std::cout << "Not valid XSPF, still readable "
- << "by libSpiff " << SPIFF_VER_MAJOR << "."
+ << "by libxspf " << SPIFF_VER_MAJOR << "."
<< SPIFF_VER_MINOR << "." << SPIFF_VER_RELEASE
<< SPIFF_VER_SUFFIX_ASCII << "."
<< std::endl << std::flush;
Modified: trunk/examples/read/read.cpp
===================================================================
--- trunk/examples/read/read.cpp 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/examples/read/read.cpp 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/examples/strip/strip.cpp
===================================================================
--- trunk/examples/strip/strip.cpp 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/examples/strip/strip.cpp 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/examples/write/write.cpp
===================================================================
--- trunk/examples/write/write.cpp 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/examples/write/write.cpp 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
@@ -56,10 +56,10 @@
// An example usage is shown below.
props.giveTitle(_PT("Now playing"), SpiffData::COPY);
props.giveAnnotation(_PT("Well, ..."), SpiffData::COPY);
- props.giveCreator(_PT("libSpiff XSPF library"), SpiffData::COPY);
+ props.giveCreator(_PT("libxspf XSPF library"), SpiffData::COPY);
SpiffDateTime dateTime(2006, 8, 28, 11, 30, 11, 1, 0);
props.giveDate(&dateTime, SpiffData::COPY);
- props.giveIdentifier(_PT("xspf:libSpiff:testId"), SpiffData::COPY);
+ props.giveIdentifier(_PT("xspf:libxspf:testId"), SpiffData::COPY);
props.giveImage(_PT("some/image.png"), SpiffData::COPY);
props.giveInfo(_PT("http://info/info"), SpiffData::COPY);
props.giveLicense(_PT("http://license/free/"), SpiffData::COPY);
Modified: trunk/include/xspf/ProjectOpus/ProjectOpusPlaylistExtension.h
===================================================================
--- trunk/include/xspf/ProjectOpus/ProjectOpusPlaylistExtension.h 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/include/xspf/ProjectOpus/ProjectOpusPlaylistExtension.h 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/include/xspf/ProjectOpus/ProjectOpusPlaylistExtensionReader.h
===================================================================
--- trunk/include/xspf/ProjectOpus/ProjectOpusPlaylistExtensionReader.h 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/include/xspf/ProjectOpus/ProjectOpusPlaylistExtensionReader.h 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/include/xspf/ProjectOpus/ProjectOpusPlaylistExtensionWriter.h
===================================================================
--- trunk/include/xspf/ProjectOpus/ProjectOpusPlaylistExtensionWriter.h 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/include/xspf/ProjectOpus/ProjectOpusPlaylistExtensionWriter.h 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/include/xspf/Xspf.h
===================================================================
--- trunk/include/xspf/Xspf.h 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/include/xspf/Xspf.h 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/include/xspf/XspfChunkCallback.h
===================================================================
--- trunk/include/xspf/XspfChunkCallback.h 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/include/xspf/XspfChunkCallback.h 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/include/xspf/XspfData.h
===================================================================
--- trunk/include/xspf/XspfData.h 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/include/xspf/XspfData.h 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/include/xspf/XspfDateTime.h
===================================================================
--- trunk/include/xspf/XspfDateTime.h 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/include/xspf/XspfDateTime.h 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/include/xspf/XspfDefines.h
===================================================================
--- trunk/include/xspf/XspfDefines.h 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/include/xspf/XspfDefines.h 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/include/xspf/XspfExtension.h
===================================================================
--- trunk/include/xspf/XspfExtension.h 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/include/xspf/XspfExtension.h 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/include/xspf/XspfExtensionReader.h
===================================================================
--- trunk/include/xspf/XspfExtensionReader.h 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/include/xspf/XspfExtensionReader.h 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/include/xspf/XspfExtensionReaderFactory.h
===================================================================
--- trunk/include/xspf/XspfExtensionReaderFactory.h 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/include/xspf/XspfExtensionReaderFactory.h 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/include/xspf/XspfExtensionWriter.h
===================================================================
--- trunk/include/xspf/XspfExtensionWriter.h 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/include/xspf/XspfExtensionWriter.h 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/include/xspf/XspfIndentFormatter.h
===================================================================
--- trunk/include/xspf/XspfIndentFormatter.h 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/include/xspf/XspfIndentFormatter.h 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/include/xspf/XspfProps.h
===================================================================
--- trunk/include/xspf/XspfProps.h 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/include/xspf/XspfProps.h 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/include/xspf/XspfReader.h
===================================================================
--- trunk/include/xspf/XspfReader.h 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/include/xspf/XspfReader.h 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/include/xspf/XspfReaderCallback.h
===================================================================
--- trunk/include/xspf/XspfReaderCallback.h 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/include/xspf/XspfReaderCallback.h 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/include/xspf/XspfSeamlessFormatter.h
===================================================================
--- trunk/include/xspf/XspfSeamlessFormatter.h 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/include/xspf/XspfSeamlessFormatter.h 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/include/xspf/XspfStack.h
===================================================================
--- trunk/include/xspf/XspfStack.h 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/include/xspf/XspfStack.h 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/include/xspf/XspfToolbox.h
===================================================================
--- trunk/include/xspf/XspfToolbox.h 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/include/xspf/XspfToolbox.h 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/include/xspf/XspfTrack.h
===================================================================
--- trunk/include/xspf/XspfTrack.h 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/include/xspf/XspfTrack.h 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/include/xspf/XspfVersion.h
===================================================================
--- trunk/include/xspf/XspfVersion.h 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/include/xspf/XspfVersion.h 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
@@ -40,7 +40,7 @@
/**
* @file SpiffVersion.h
- * Holds libSpiff version constants.
+ * Holds libxspf version constants.
*/
#ifndef SPIFF_VERSION_H
Modified: trunk/include/xspf/XspfWriter.h
===================================================================
--- trunk/include/xspf/XspfWriter.h 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/include/xspf/XspfWriter.h 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/include/xspf/XspfXmlFormatter.h
===================================================================
--- trunk/include/xspf/XspfXmlFormatter.h 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/include/xspf/XspfXmlFormatter.h 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/include/xspf/ZirkorosOnline/ZirkorosOnlineTrackExtension.h
===================================================================
--- trunk/include/xspf/ZirkorosOnline/ZirkorosOnlineTrackExtension.h 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/include/xspf/ZirkorosOnline/ZirkorosOnlineTrackExtension.h 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2008, Pekka Lamminranta
* Copyright (C) 2008, Sebastian Pipping / Xiph.Org Foundation
Modified: trunk/include/xspf/ZirkorosOnline/ZirkorosOnlineTrackExtensionReader.h
===================================================================
--- trunk/include/xspf/ZirkorosOnline/ZirkorosOnlineTrackExtensionReader.h 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/include/xspf/ZirkorosOnline/ZirkorosOnlineTrackExtensionReader.h 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2008, Pekka Lamminranta
* Copyright (C) 2008, Sebastian Pipping / Xiph.Org Foundation
Modified: trunk/include/xspf/ZirkorosOnline/ZirkorosOnlineTrackExtensionWriter.h
===================================================================
--- trunk/include/xspf/ZirkorosOnline/ZirkorosOnlineTrackExtensionWriter.h 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/include/xspf/ZirkorosOnline/ZirkorosOnlineTrackExtensionWriter.h 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2008, Pekka Lamminranta
* Copyright (C) 2008, Sebastian Pipping / Xiph.Org Foundation
Modified: trunk/src/ProjectOpus/ProjectOpusPlaylistExtension.cpp
===================================================================
--- trunk/src/ProjectOpus/ProjectOpusPlaylistExtension.cpp 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/src/ProjectOpus/ProjectOpusPlaylistExtension.cpp 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/src/ProjectOpus/ProjectOpusPlaylistExtensionReader.cpp
===================================================================
--- trunk/src/ProjectOpus/ProjectOpusPlaylistExtensionReader.cpp 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/src/ProjectOpus/ProjectOpusPlaylistExtensionReader.cpp 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/src/ProjectOpus/ProjectOpusPlaylistExtensionWriter.cpp
===================================================================
--- trunk/src/ProjectOpus/ProjectOpusPlaylistExtensionWriter.cpp 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/src/ProjectOpus/ProjectOpusPlaylistExtensionWriter.cpp 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/src/XspfChunkCallback.cpp
===================================================================
--- trunk/src/XspfChunkCallback.cpp 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/src/XspfChunkCallback.cpp 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/src/XspfData.cpp
===================================================================
--- trunk/src/XspfData.cpp 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/src/XspfData.cpp 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/src/XspfDataWriter.cpp
===================================================================
--- trunk/src/XspfDataWriter.cpp 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/src/XspfDataWriter.cpp 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/src/XspfDataWriter.h
===================================================================
--- trunk/src/XspfDataWriter.h 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/src/XspfDataWriter.h 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/src/XspfDateTime.cpp
===================================================================
--- trunk/src/XspfDateTime.cpp 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/src/XspfDateTime.cpp 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/src/XspfExtension.cpp
===================================================================
--- trunk/src/XspfExtension.cpp 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/src/XspfExtension.cpp 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/src/XspfExtensionReader.cpp
===================================================================
--- trunk/src/XspfExtensionReader.cpp 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/src/XspfExtensionReader.cpp 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/src/XspfExtensionReaderFactory.cpp
===================================================================
--- trunk/src/XspfExtensionReaderFactory.cpp 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/src/XspfExtensionReaderFactory.cpp 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/src/XspfExtensionWriter.cpp
===================================================================
--- trunk/src/XspfExtensionWriter.cpp 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/src/XspfExtensionWriter.cpp 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/src/XspfIndentFormatter.cpp
===================================================================
--- trunk/src/XspfIndentFormatter.cpp 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/src/XspfIndentFormatter.cpp 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/src/XspfProps.cpp
===================================================================
--- trunk/src/XspfProps.cpp 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/src/XspfProps.cpp 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/src/XspfPropsWriter.cpp
===================================================================
--- trunk/src/XspfPropsWriter.cpp 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/src/XspfPropsWriter.cpp 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/src/XspfPropsWriter.h
===================================================================
--- trunk/src/XspfPropsWriter.h 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/src/XspfPropsWriter.h 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/src/XspfReader.cpp
===================================================================
--- trunk/src/XspfReader.cpp 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/src/XspfReader.cpp 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/src/XspfReaderCallback.cpp
===================================================================
--- trunk/src/XspfReaderCallback.cpp 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/src/XspfReaderCallback.cpp 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/src/XspfSeamlessFormatter.cpp
===================================================================
--- trunk/src/XspfSeamlessFormatter.cpp 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/src/XspfSeamlessFormatter.cpp 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/src/XspfSkipExtensionReader.cpp
===================================================================
--- trunk/src/XspfSkipExtensionReader.cpp 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/src/XspfSkipExtensionReader.cpp 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/src/XspfSkipExtensionReader.h
===================================================================
--- trunk/src/XspfSkipExtensionReader.h 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/src/XspfSkipExtensionReader.h 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/src/XspfStrictReaderCallback.cpp
===================================================================
--- trunk/src/XspfStrictReaderCallback.cpp 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/src/XspfStrictReaderCallback.cpp 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/src/XspfStrictReaderCallback.h
===================================================================
--- trunk/src/XspfStrictReaderCallback.h 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/src/XspfStrictReaderCallback.h 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/src/XspfToolbox.cpp
===================================================================
--- trunk/src/XspfToolbox.cpp 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/src/XspfToolbox.cpp 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/src/XspfTrack.cpp
===================================================================
--- trunk/src/XspfTrack.cpp 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/src/XspfTrack.cpp 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/src/XspfTrackWriter.cpp
===================================================================
--- trunk/src/XspfTrackWriter.cpp 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/src/XspfTrackWriter.cpp 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/src/XspfTrackWriter.h
===================================================================
--- trunk/src/XspfTrackWriter.h 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/src/XspfTrackWriter.h 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/src/XspfWriter.cpp
===================================================================
--- trunk/src/XspfWriter.cpp 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/src/XspfWriter.cpp 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/src/XspfXmlFormatter.cpp
===================================================================
--- trunk/src/XspfXmlFormatter.cpp 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/src/XspfXmlFormatter.cpp 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/src/ZirkorosOnline/ZirkorosOnlineTrackExtension.cpp
===================================================================
--- trunk/src/ZirkorosOnline/ZirkorosOnlineTrackExtension.cpp 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/src/ZirkorosOnline/ZirkorosOnlineTrackExtension.cpp 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2008, Pekka Lamminranta
* Copyright (C) 2008, Sebastian Pipping / Xiph.Org Foundation
Modified: trunk/src/ZirkorosOnline/ZirkorosOnlineTrackExtensionReader.cpp
===================================================================
--- trunk/src/ZirkorosOnline/ZirkorosOnlineTrackExtensionReader.cpp 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/src/ZirkorosOnline/ZirkorosOnlineTrackExtensionReader.cpp 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2008, Pekka Lamminranta
* Copyright (C) 2008, Sebastian Pipping / Xiph.Org Foundation
Modified: trunk/src/ZirkorosOnline/ZirkorosOnlineTrackExtensionWriter.cpp
===================================================================
--- trunk/src/ZirkorosOnline/ZirkorosOnlineTrackExtensionWriter.cpp 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/src/ZirkorosOnline/ZirkorosOnlineTrackExtensionWriter.cpp 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2008, Pekka Lamminranta
* Copyright (C) 2008, Sebastian Pipping / Xiph.Org Foundation
Modified: trunk/test/ChunkCallbackSuite.cpp
===================================================================
--- trunk/test/ChunkCallbackSuite.cpp 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/test/ChunkCallbackSuite.cpp 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/test/ChunkCallbackSuite.h
===================================================================
--- trunk/test/ChunkCallbackSuite.h 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/test/ChunkCallbackSuite.h 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/test/DateTimeSuite.cpp
===================================================================
--- trunk/test/DateTimeSuite.cpp 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/test/DateTimeSuite.cpp 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/test/DateTimeSuite.h
===================================================================
--- trunk/test/DateTimeSuite.h 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/test/DateTimeSuite.h 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/test/ExtensionReaderFactorySuite.cpp
===================================================================
--- trunk/test/ExtensionReaderFactorySuite.cpp 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/test/ExtensionReaderFactorySuite.cpp 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/test/ExtensionReaderFactorySuite.h
===================================================================
--- trunk/test/ExtensionReaderFactorySuite.h 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/test/ExtensionReaderFactorySuite.h 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/test/MaliciousXmlSuite.cpp
===================================================================
--- trunk/test/MaliciousXmlSuite.cpp 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/test/MaliciousXmlSuite.cpp 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/test/MaliciousXmlSuite.h
===================================================================
--- trunk/test/MaliciousXmlSuite.h 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/test/MaliciousXmlSuite.h 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/test/MemoryModelSuite.cpp
===================================================================
--- trunk/test/MemoryModelSuite.cpp 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/test/MemoryModelSuite.cpp 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/test/MemoryModelSuite.h
===================================================================
--- trunk/test/MemoryModelSuite.h 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/test/MemoryModelSuite.h 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/test/OfficialSuite.cpp
===================================================================
--- trunk/test/OfficialSuite.cpp 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/test/OfficialSuite.cpp 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/test/OfficialSuite.h
===================================================================
--- trunk/test/OfficialSuite.h 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/test/OfficialSuite.h 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/test/ProjectOpus/ProjectOpusSuite.cpp
===================================================================
--- trunk/test/ProjectOpus/ProjectOpusSuite.cpp 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/test/ProjectOpus/ProjectOpusSuite.cpp 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/test/ProjectOpus/ProjectOpusSuite.h
===================================================================
--- trunk/test/ProjectOpus/ProjectOpusSuite.h 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/test/ProjectOpus/ProjectOpusSuite.h 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/test/ReadWriteSuite.cpp
===================================================================
--- trunk/test/ReadWriteSuite.cpp 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/test/ReadWriteSuite.cpp 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/test/ReadWriteSuite.h
===================================================================
--- trunk/test/ReadWriteSuite.h 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/test/ReadWriteSuite.h 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/test/WhiteSpaceSuite.cpp
===================================================================
--- trunk/test/WhiteSpaceSuite.cpp 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/test/WhiteSpaceSuite.cpp 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/test/WhiteSpaceSuite.h
===================================================================
--- trunk/test/WhiteSpaceSuite.h 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/test/WhiteSpaceSuite.h 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
Modified: trunk/test/ZirkorosOnline/ZirkorosOnlineSuite.cpp
===================================================================
--- trunk/test/ZirkorosOnline/ZirkorosOnlineSuite.cpp 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/test/ZirkorosOnline/ZirkorosOnlineSuite.cpp 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2008, Pekka Lamminranta
* Copyright (C) 2008, Sebastian Pipping / Xiph.Org Foundation
Modified: trunk/test/ZirkorosOnline/ZirkorosOnlineSuite.h
===================================================================
--- trunk/test/ZirkorosOnline/ZirkorosOnlineSuite.h 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/test/ZirkorosOnline/ZirkorosOnlineSuite.h 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2008, Pekka Lamminranta
* Copyright (C) 2008, Sebastian Pipping / Xiph.Org Foundation
Modified: trunk/test/test.cpp
===================================================================
--- trunk/test/test.cpp 2009-02-17 20:42:15 UTC (rev 513)
+++ trunk/test/test.cpp 2009-02-17 20:56:50 UTC (rev 514)
@@ -1,5 +1,5 @@
/*
- * libSpiff - XSPF playlist handling library
+ * libxspf - XSPF playlist handling library
*
* Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
* All rights reserved.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <har...@us...> - 2009-02-17 20:42:23
|
Revision: 513
http://libspiff.svn.sourceforge.net/libspiff/?rev=513&view=rev
Author: hartwork
Date: 2009-02-17 20:42:15 +0000 (Tue, 17 Feb 2009)
Log Message:
-----------
Rename libSpiff to libxspf - step 1: file level
Added Paths:
-----------
trunk/bindings/c/xspf_c.cpp
trunk/bindings/c/xspf_c.h
trunk/include/xspf/
trunk/include/xspf/ProjectOpus/
trunk/include/xspf/Xspf.h
trunk/include/xspf/XspfChunkCallback.h
trunk/include/xspf/XspfData.h
trunk/include/xspf/XspfDateTime.h
trunk/include/xspf/XspfDefines.h
trunk/include/xspf/XspfExtension.h
trunk/include/xspf/XspfExtensionReader.h
trunk/include/xspf/XspfExtensionReaderFactory.h
trunk/include/xspf/XspfExtensionWriter.h
trunk/include/xspf/XspfIndentFormatter.h
trunk/include/xspf/XspfProps.h
trunk/include/xspf/XspfReader.h
trunk/include/xspf/XspfReaderCallback.h
trunk/include/xspf/XspfSeamlessFormatter.h
trunk/include/xspf/XspfStack.h
trunk/include/xspf/XspfToolbox.h
trunk/include/xspf/XspfTrack.h
trunk/include/xspf/XspfVersion.h
trunk/include/xspf/XspfWriter.h
trunk/include/xspf/XspfXmlFormatter.h
trunk/include/xspf/ZirkorosOnline/
trunk/src/XspfChunkCallback.cpp
trunk/src/XspfData.cpp
trunk/src/XspfDataWriter.cpp
trunk/src/XspfDataWriter.h
trunk/src/XspfDateTime.cpp
trunk/src/XspfExtension.cpp
trunk/src/XspfExtensionReader.cpp
trunk/src/XspfExtensionReaderFactory.cpp
trunk/src/XspfExtensionWriter.cpp
trunk/src/XspfIndentFormatter.cpp
trunk/src/XspfProps.cpp
trunk/src/XspfPropsWriter.cpp
trunk/src/XspfPropsWriter.h
trunk/src/XspfReader.cpp
trunk/src/XspfReaderCallback.cpp
trunk/src/XspfSeamlessFormatter.cpp
trunk/src/XspfSkipExtensionReader.cpp
trunk/src/XspfSkipExtensionReader.h
trunk/src/XspfStrictReaderCallback.cpp
trunk/src/XspfStrictReaderCallback.h
trunk/src/XspfToolbox.cpp
trunk/src/XspfTrack.cpp
trunk/src/XspfTrackWriter.cpp
trunk/src/XspfTrackWriter.h
trunk/src/XspfWriter.cpp
trunk/src/XspfXmlFormatter.cpp
trunk/win32/Code_Blocks/libxspf.cbp
trunk/win32/Code_Blocks/libxspf.workspace
trunk/win32/Visual_Studio_2005/libxspf.sln
trunk/win32/Visual_Studio_2005/libxspf.vcproj
Removed Paths:
-------------
trunk/bindings/c/spiff_c.cpp
trunk/bindings/c/spiff_c.h
trunk/include/spiff/
trunk/src/SpiffChunkCallback.cpp
trunk/src/SpiffData.cpp
trunk/src/SpiffDataWriter.cpp
trunk/src/SpiffDataWriter.h
trunk/src/SpiffDateTime.cpp
trunk/src/SpiffExtension.cpp
trunk/src/SpiffExtensionReader.cpp
trunk/src/SpiffExtensionReaderFactory.cpp
trunk/src/SpiffExtensionWriter.cpp
trunk/src/SpiffIndentFormatter.cpp
trunk/src/SpiffProps.cpp
trunk/src/SpiffPropsWriter.cpp
trunk/src/SpiffPropsWriter.h
trunk/src/SpiffReader.cpp
trunk/src/SpiffReaderCallback.cpp
trunk/src/SpiffSeamlessFormatter.cpp
trunk/src/SpiffSkipExtensionReader.cpp
trunk/src/SpiffSkipExtensionReader.h
trunk/src/SpiffStrictReaderCallback.cpp
trunk/src/SpiffStrictReaderCallback.h
trunk/src/SpiffToolbox.cpp
trunk/src/SpiffTrack.cpp
trunk/src/SpiffTrackWriter.cpp
trunk/src/SpiffTrackWriter.h
trunk/src/SpiffWriter.cpp
trunk/src/SpiffXmlFormatter.cpp
trunk/win32/Code_Blocks/libspiff.cbp
trunk/win32/Code_Blocks/libspiff.workspace
trunk/win32/Visual_Studio_2005/libspiff.sln
trunk/win32/Visual_Studio_2005/libspiff.vcproj
Deleted: trunk/bindings/c/spiff_c.cpp
===================================================================
--- trunk/bindings/c/spiff_c.cpp 2009-02-13 13:10:07 UTC (rev 512)
+++ trunk/bindings/c/spiff_c.cpp 2009-02-17 20:42:15 UTC (rev 513)
@@ -1,341 +0,0 @@
-/*
- * spiff_c - Simple C interface for libSpiff
- *
- * Copyright (C) 2007, Ed Schouten / Xiph.Org Foundation
- * Copyright (C) 2008, Sebastian Pipping / Xiph.Org Foundation
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * * Redistributions of source code must retain the above
- * copyright notice, this list of conditions and the following
- * disclaimer.
- *
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials
- * provided with the distribution.
- *
- * * Neither the name of the Xiph.Org Foundation nor the names of
- * its contributors may be used to endorse or promote products
- * derived from this software without specific prior written
- * permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Ed Schouten <ed...@fx...>
- * Sebastian Pipping <sp...@xi...>
- */
-/**
- * @file spiff_c.cpp
- * @brief Simple libSpiff C bindings.
- */
-
-#include <spiff/SpiffIndentFormatter.h>
-#include <spiff/SpiffProps.h>
-#include <spiff/SpiffReader.h>
-#include <spiff/SpiffReaderCallback.h>
-#include <spiff/SpiffTrack.h>
-#include <spiff/SpiffWriter.h>
-#include <cstring>
-
-extern "C" {
-#include "spiff_c.h"
-}
-
-using namespace Spiff;
-
-/**
- * @brief Spiff list reading callback, which stores data in a specific
- * C-style Spiff list.
- */
-class SpiffCReaderCallback : public SpiffReaderCallback {
-private:
- /**
- * @brief The C-style Spiff list the tracks should be appended
- * to.
- */
- spiff_list *list;
- /**
- * @brief Pointer to the `next' field in the last inserted item
- * for improving append speed.
- */
- spiff_track **newtrack;
-
- /**
- * @brief Callback which adds tracks to the spiff_list.
- */
- void addTrack(SpiffTrack *track);
- /**
- * @brief Callback which sets properties in the spiff_list.
- */
- void setProps(SpiffProps *props);
-public:
- /**
- * @brief Create callback interface for filling a spiff_list.
- */
- SpiffCReaderCallback(spiff_list *list);
- /**
- * @brief Finalize the spiff_list.
- */
- virtual ~SpiffCReaderCallback();
-};
-
-SpiffCReaderCallback::SpiffCReaderCallback(spiff_list *list)
-{
- this->list = list;
- newtrack = &list->tracks;
-}
-
-SpiffCReaderCallback::~SpiffCReaderCallback()
-{
- /* Null-terminate the tracks list */
- *newtrack = NULL;
-}
-
-void
-SpiffCReaderCallback::addTrack(SpiffTrack *track)
-{
- spiff_mvalue **newmv;
- char *str;
-
- /* Append new item to the track list */
- *newtrack = new spiff_track;
-
- (*newtrack)->creator = track->stealCreator();
- (*newtrack)->title = track->stealTitle();
- (*newtrack)->album = track->stealAlbum();
- (*newtrack)->duration = track->getDuration();
- (*newtrack)->tracknum = track->getTrackNum();
- (*newtrack)->pdata = NULL;
-
- /* Locations */
- newmv = &(*newtrack)->locations;
- while ((str = track->stealFirstLocation()) != NULL) {
- *newmv = new spiff_mvalue;
- (*newmv)->value = str;
- (*newmv)->pdata = NULL;
-
- /* On to the next location */
- newmv = &(*newmv)->next;
- }
- *newmv = NULL;
-
- /* Identifiers */
- newmv = &(*newtrack)->identifiers;
- while ((str = track->stealFirstIdentifier()) != NULL) {
- *newmv = new spiff_mvalue;
- (*newmv)->value = str;
- (*newmv)->pdata = NULL;
-
- /* On to the next location */
- newmv = &(*newmv)->next;
- }
- *newmv = NULL;
-
- /* Clean up and move to the next track */
- delete track;
- newtrack = &(*newtrack)->next;
-}
-
-void
-SpiffCReaderCallback::setProps(SpiffProps *props)
-{
- list->license = props->stealLicense();
- list->location = props->stealLocation();
- list->identifier = props->stealIdentifier();
-
- delete props;
-}
-
-/**
- * @brief Deallocate all objects in a spiff_mvalue linked list.
- */
-static void
-spiff_mvalue_free(struct spiff_mvalue *mv)
-{
- struct spiff_mvalue *nmv;
-
- for (; mv != NULL; mv = nmv) {
- /* Back-up pointer */
- nmv = mv->next;
- delete [] mv->value;
- delete mv;
- }
-}
-
-/*
- * Public C interface
- */
-
-extern "C" struct spiff_list *
-spiff_parse(char const *filename, char const *baseuri)
-{
- SpiffReader read;
- spiff_list *ret;
-
- /* Allocate empty playlist */
- ret = new spiff_list;
-
- /* Fill the list with parser results */
- SpiffCReaderCallback readcb(ret);
- if (read.parseFile(filename, &readcb, baseuri) == SPIFF_READER_SUCCESS) {
- /* Success */
- return (ret);
- } else {
- /* Malformed/non-existent list */
- delete ret;
- return (NULL);
- }
-}
-
-extern "C" struct spiff_list *
-spiff_new(void)
-{
- spiff_list *ret;
-
- ret = new spiff_list;
- ret->license = NULL;
- ret->location = NULL;
- ret->identifier = NULL;
- ret->tracks = NULL;
- ret->pdata = NULL;
-
- return (ret);
-}
-
-extern "C" void
-spiff_free(struct spiff_list *list)
-{
- spiff_track *tr, *ntr;
-
- delete [] list->license;
- delete [] list->location;
- delete [] list->identifier;
-
- for (tr = list->tracks; tr != NULL; tr = ntr) {
- /* Back-up pointer */
- ntr = tr->next;
-
- delete [] tr->creator;
- delete [] tr->title;
- delete [] tr->album;
-
- spiff_mvalue_free(tr->locations);
- spiff_mvalue_free(tr->identifiers);
-
- delete tr;
- }
-
- delete list;
-}
-
-extern "C" void
-spiff_setvalue(char **str, char const *nstr)
-{
- /* Delete old string */
- delete [] *str;
-
- if (nstr == NULL) {
- /* Unset value */
- *str = NULL;
- } else {
- /* Copy value */
- size_t len;
- len = strlen(nstr) + 1;
- *str = new char[len];
- strcpy(*str, nstr);
- }
-}
-
-extern "C" struct spiff_mvalue *
-spiff_new_mvalue_before(struct spiff_mvalue **mvalue)
-{
- spiff_mvalue *ret;
-
- ret = new spiff_mvalue;
- ret->value = NULL;
- ret->pdata = NULL;
- ret->next = *mvalue;
- *mvalue = ret;
-
- return (ret);
-}
-
-extern "C" struct spiff_track *
-spiff_new_track_before(struct spiff_track **track)
-{
- spiff_track *ret;
-
- ret = new spiff_track;
- ret->creator = NULL;
- ret->title = NULL;
- ret->album = NULL;
- ret->duration = -1;
- ret->tracknum = -1;
- ret->locations = NULL;
- ret->identifiers = NULL;
- ret->pdata = NULL;
- ret->next = *track;
- *track = ret;
-
- return (ret);
-}
-
-int
-spiff_write(struct spiff_list *list, char const *filename, char const *baseuri)
-{
- spiff_track *strack;
- spiff_mvalue *smvalue;
- SpiffIndentFormatter formatter(-2);
- int error;
- SpiffWriter * const writer = SpiffWriter::makeWriter(formatter,
- baseuri, SpiffWriter::NO_XML_BASE, &error);
- if (writer == NULL) {
- return error;
- }
-
- /* Playlist properties */
- {
- SpiffProps props;
- props.lendLicense(list->license);
- props.lendLocation(list->location);
- props.lendIdentifier(list->identifier);
- writer->setProps(props);
- }
-
- SPIFF_LIST_FOREACH_TRACK(list, strack) {
- /* Tracks */
- SpiffTrack track;
- track.lendCreator(strack->creator);
- track.lendTitle(strack->title);
- track.lendAlbum(strack->album);
- track.setDuration(strack->duration);
- track.setTrackNum(strack->tracknum);
-
- /* Track locations and identifiers */
- SPIFF_TRACK_FOREACH_LOCATION(strack,smvalue)
- track.lendAppendLocation(smvalue->value);
- SPIFF_TRACK_FOREACH_IDENTIFIER(strack, smvalue)
- track.lendAppendIdentifier(smvalue->value);
-
- writer->addTrack(track);
- }
-
- int const res = writer->writeFile(filename);
- delete writer;
- return res;
-}
Deleted: trunk/bindings/c/spiff_c.h
===================================================================
--- trunk/bindings/c/spiff_c.h 2009-02-13 13:10:07 UTC (rev 512)
+++ trunk/bindings/c/spiff_c.h 2009-02-17 20:42:15 UTC (rev 513)
@@ -1,198 +0,0 @@
-/*
- * spiff_c - Simple C interface for libSpiff
- *
- * Copyright (C) 2007, Ed Schouten / Xiph.Org Foundation
- * Copyright (C) 2008, Sebastian Pipping / Xiph.Org Foundation
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * * Redistributions of source code must retain the above
- * copyright notice, this list of conditions and the following
- * disclaimer.
- *
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials
- * provided with the distribution.
- *
- * * Neither the name of the Xiph.Org Foundation nor the names of
- * its contributors may be used to endorse or promote products
- * derived from this software without specific prior written
- * permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Ed Schouten <ed...@fx...>
- * Sebastian Pipping <sp...@xi...>
- */
-/**
- * @file spiff_c.h
- * @brief Simple libSpiff C bindings.
- */
-
-#ifndef SPIFF_C_H
-#define SPIFF_C_H
-
-/**
- * @brief Linked list for values inside tracks or lists with string
- * values.
- */
-struct spiff_mvalue {
- /**
- * @brief Value of the current list entry.
- */
- char *value;
- /**
- * @brief Pointer to next object in the list.
- */
- struct spiff_mvalue *next;
-
- /**
- * @brief Private data that can be freely used.
- */
- void *pdata;
-};
-
-/**
- * @brief Single track in an XSPF list.
- */
-struct spiff_track {
- /**
- * @brief Track's creator.
- */
- char *creator;
- /**
- * @brief Track's display name.
- */
- char *title;
- /**
- * @brief Album or collection of origin.
- */
- char *album;
-
- /**
- * @brief Track duration in milliseconds.
- */
- int duration;
- /**
- * @brief Track number.
- */
- int tracknum;
-
- /**
- * @brief Track's file locations.
- */
- struct spiff_mvalue *locations;
- /**
- * @brief Unique track identifiers.
- */
- struct spiff_mvalue *identifiers;
-
- /**
- * @brief Pointer to next track.
- */
- struct spiff_track *next;
-
- /**
- * @brief Private data that can be freely used.
- */
- void *pdata;
-};
-
-/**
- * @brief Parsed XSPF file.
- */
-struct spiff_list {
- /**
- * @brief Playlist's license.
- */
- char *license;
- /**
- * @brief Playlist's file location.
- */
- char *location;
- /**
- * @brief Playlist's unique indentifier.
- */
- char *identifier;
-
- /**
- * @brief Linked list of tracks inside the playlist.
- */
- struct spiff_track *tracks;
-
- /**
- * @brief Private data that can be freely used.
- */
- void *pdata;
-};
-
-/**
- * @brief Easy interface for walking through tracks.
- */
-#define SPIFF_LIST_FOREACH_TRACK(l,t) \
- for ((t) = (l)->tracks; (t) != NULL; (t) = (t)->next)
-/**
- * @brief Easy interface for walking through locations.
- */
-#define SPIFF_TRACK_FOREACH_LOCATION(t,l) \
- for ((l) = (t)->locations; (l) != NULL; (l) = (l)->next)
-/**
- * @brief Easy interface for walking through identifiers.
- */
-#define SPIFF_TRACK_FOREACH_IDENTIFIER(t,i) \
- for ((i) = (t)->identifiers; (i) != NULL; (i) = (i)->next)
-
-/**
- * @brief Parse an XSPF file by filename.
- */
-struct spiff_list *spiff_parse(char const *filename, char const *baseuri);
-/**
- * @brief Create a new empty XSPF playlist.
- */
-struct spiff_list *spiff_new(void);
-/**
- * @brief Free the parser results.
- */
-void spiff_free(struct spiff_list *list);
-/**
- * @brief Set or overwrite a value in the spiff_list, spiff_track or
- * spiff_mvalue structures. Passing NULL will unset the string.
- */
-void spiff_setvalue(char **str, char const *nstr);
-/**
- * @brief Insert a new mvalue to the linked list before the specified
- * one. This routine can also be used to insert a new mvalue to
- * the end of the list (or an empty list) by passing the address
- * of the mvalue list or the next field in the last object.
- */
-struct spiff_mvalue *spiff_new_mvalue_before(
- struct spiff_mvalue **mvalue);
-/**
- * @brief Insert a new track to the linked list before the specified
- * one. This routine can also be used to insert a new track to
- * the end of the list (or an empty list) by passing the address
- * of the track list or the next field in the last object.
- */
-struct spiff_track *spiff_new_track_before(
- struct spiff_track **track);
-/**
- * @brief Write the Spiff playlist to a file.
- */
-int spiff_write(struct spiff_list *list, char const *filename, char const *baseuri);
-
-#endif /* !SPIFF_C_H */
Copied: trunk/bindings/c/xspf_c.cpp (from rev 512, trunk/bindings/c/spiff_c.cpp)
===================================================================
--- trunk/bindings/c/xspf_c.cpp (rev 0)
+++ trunk/bindings/c/xspf_c.cpp 2009-02-17 20:42:15 UTC (rev 513)
@@ -0,0 +1,341 @@
+/*
+ * spiff_c - Simple C interface for libSpiff
+ *
+ * Copyright (C) 2007, Ed Schouten / Xiph.Org Foundation
+ * Copyright (C) 2008, Sebastian Pipping / Xiph.Org Foundation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * * Neither the name of the Xiph.Org Foundation nor the names of
+ * its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written
+ * permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Ed Schouten <ed...@fx...>
+ * Sebastian Pipping <sp...@xi...>
+ */
+/**
+ * @file spiff_c.cpp
+ * @brief Simple libSpiff C bindings.
+ */
+
+#include <spiff/SpiffIndentFormatter.h>
+#include <spiff/SpiffProps.h>
+#include <spiff/SpiffReader.h>
+#include <spiff/SpiffReaderCallback.h>
+#include <spiff/SpiffTrack.h>
+#include <spiff/SpiffWriter.h>
+#include <cstring>
+
+extern "C" {
+#include "spiff_c.h"
+}
+
+using namespace Spiff;
+
+/**
+ * @brief Spiff list reading callback, which stores data in a specific
+ * C-style Spiff list.
+ */
+class SpiffCReaderCallback : public SpiffReaderCallback {
+private:
+ /**
+ * @brief The C-style Spiff list the tracks should be appended
+ * to.
+ */
+ spiff_list *list;
+ /**
+ * @brief Pointer to the `next' field in the last inserted item
+ * for improving append speed.
+ */
+ spiff_track **newtrack;
+
+ /**
+ * @brief Callback which adds tracks to the spiff_list.
+ */
+ void addTrack(SpiffTrack *track);
+ /**
+ * @brief Callback which sets properties in the spiff_list.
+ */
+ void setProps(SpiffProps *props);
+public:
+ /**
+ * @brief Create callback interface for filling a spiff_list.
+ */
+ SpiffCReaderCallback(spiff_list *list);
+ /**
+ * @brief Finalize the spiff_list.
+ */
+ virtual ~SpiffCReaderCallback();
+};
+
+SpiffCReaderCallback::SpiffCReaderCallback(spiff_list *list)
+{
+ this->list = list;
+ newtrack = &list->tracks;
+}
+
+SpiffCReaderCallback::~SpiffCReaderCallback()
+{
+ /* Null-terminate the tracks list */
+ *newtrack = NULL;
+}
+
+void
+SpiffCReaderCallback::addTrack(SpiffTrack *track)
+{
+ spiff_mvalue **newmv;
+ char *str;
+
+ /* Append new item to the track list */
+ *newtrack = new spiff_track;
+
+ (*newtrack)->creator = track->stealCreator();
+ (*newtrack)->title = track->stealTitle();
+ (*newtrack)->album = track->stealAlbum();
+ (*newtrack)->duration = track->getDuration();
+ (*newtrack)->tracknum = track->getTrackNum();
+ (*newtrack)->pdata = NULL;
+
+ /* Locations */
+ newmv = &(*newtrack)->locations;
+ while ((str = track->stealFirstLocation()) != NULL) {
+ *newmv = new spiff_mvalue;
+ (*newmv)->value = str;
+ (*newmv)->pdata = NULL;
+
+ /* On to the next location */
+ newmv = &(*newmv)->next;
+ }
+ *newmv = NULL;
+
+ /* Identifiers */
+ newmv = &(*newtrack)->identifiers;
+ while ((str = track->stealFirstIdentifier()) != NULL) {
+ *newmv = new spiff_mvalue;
+ (*newmv)->value = str;
+ (*newmv)->pdata = NULL;
+
+ /* On to the next location */
+ newmv = &(*newmv)->next;
+ }
+ *newmv = NULL;
+
+ /* Clean up and move to the next track */
+ delete track;
+ newtrack = &(*newtrack)->next;
+}
+
+void
+SpiffCReaderCallback::setProps(SpiffProps *props)
+{
+ list->license = props->stealLicense();
+ list->location = props->stealLocation();
+ list->identifier = props->stealIdentifier();
+
+ delete props;
+}
+
+/**
+ * @brief Deallocate all objects in a spiff_mvalue linked list.
+ */
+static void
+spiff_mvalue_free(struct spiff_mvalue *mv)
+{
+ struct spiff_mvalue *nmv;
+
+ for (; mv != NULL; mv = nmv) {
+ /* Back-up pointer */
+ nmv = mv->next;
+ delete [] mv->value;
+ delete mv;
+ }
+}
+
+/*
+ * Public C interface
+ */
+
+extern "C" struct spiff_list *
+spiff_parse(char const *filename, char const *baseuri)
+{
+ SpiffReader read;
+ spiff_list *ret;
+
+ /* Allocate empty playlist */
+ ret = new spiff_list;
+
+ /* Fill the list with parser results */
+ SpiffCReaderCallback readcb(ret);
+ if (read.parseFile(filename, &readcb, baseuri) == SPIFF_READER_SUCCESS) {
+ /* Success */
+ return (ret);
+ } else {
+ /* Malformed/non-existent list */
+ delete ret;
+ return (NULL);
+ }
+}
+
+extern "C" struct spiff_list *
+spiff_new(void)
+{
+ spiff_list *ret;
+
+ ret = new spiff_list;
+ ret->license = NULL;
+ ret->location = NULL;
+ ret->identifier = NULL;
+ ret->tracks = NULL;
+ ret->pdata = NULL;
+
+ return (ret);
+}
+
+extern "C" void
+spiff_free(struct spiff_list *list)
+{
+ spiff_track *tr, *ntr;
+
+ delete [] list->license;
+ delete [] list->location;
+ delete [] list->identifier;
+
+ for (tr = list->tracks; tr != NULL; tr = ntr) {
+ /* Back-up pointer */
+ ntr = tr->next;
+
+ delete [] tr->creator;
+ delete [] tr->title;
+ delete [] tr->album;
+
+ spiff_mvalue_free(tr->locations);
+ spiff_mvalue_free(tr->identifiers);
+
+ delete tr;
+ }
+
+ delete list;
+}
+
+extern "C" void
+spiff_setvalue(char **str, char const *nstr)
+{
+ /* Delete old string */
+ delete [] *str;
+
+ if (nstr == NULL) {
+ /* Unset value */
+ *str = NULL;
+ } else {
+ /* Copy value */
+ size_t len;
+ len = strlen(nstr) + 1;
+ *str = new char[len];
+ strcpy(*str, nstr);
+ }
+}
+
+extern "C" struct spiff_mvalue *
+spiff_new_mvalue_before(struct spiff_mvalue **mvalue)
+{
+ spiff_mvalue *ret;
+
+ ret = new spiff_mvalue;
+ ret->value = NULL;
+ ret->pdata = NULL;
+ ret->next = *mvalue;
+ *mvalue = ret;
+
+ return (ret);
+}
+
+extern "C" struct spiff_track *
+spiff_new_track_before(struct spiff_track **track)
+{
+ spiff_track *ret;
+
+ ret = new spiff_track;
+ ret->creator = NULL;
+ ret->title = NULL;
+ ret->album = NULL;
+ ret->duration = -1;
+ ret->tracknum = -1;
+ ret->locations = NULL;
+ ret->identifiers = NULL;
+ ret->pdata = NULL;
+ ret->next = *track;
+ *track = ret;
+
+ return (ret);
+}
+
+int
+spiff_write(struct spiff_list *list, char const *filename, char const *baseuri)
+{
+ spiff_track *strack;
+ spiff_mvalue *smvalue;
+ SpiffIndentFormatter formatter(-2);
+ int error;
+ SpiffWriter * const writer = SpiffWriter::makeWriter(formatter,
+ baseuri, SpiffWriter::NO_XML_BASE, &error);
+ if (writer == NULL) {
+ return error;
+ }
+
+ /* Playlist properties */
+ {
+ SpiffProps props;
+ props.lendLicense(list->license);
+ props.lendLocation(list->location);
+ props.lendIdentifier(list->identifier);
+ writer->setProps(props);
+ }
+
+ SPIFF_LIST_FOREACH_TRACK(list, strack) {
+ /* Tracks */
+ SpiffTrack track;
+ track.lendCreator(strack->creator);
+ track.lendTitle(strack->title);
+ track.lendAlbum(strack->album);
+ track.setDuration(strack->duration);
+ track.setTrackNum(strack->tracknum);
+
+ /* Track locations and identifiers */
+ SPIFF_TRACK_FOREACH_LOCATION(strack,smvalue)
+ track.lendAppendLocation(smvalue->value);
+ SPIFF_TRACK_FOREACH_IDENTIFIER(strack, smvalue)
+ track.lendAppendIdentifier(smvalue->value);
+
+ writer->addTrack(track);
+ }
+
+ int const res = writer->writeFile(filename);
+ delete writer;
+ return res;
+}
Copied: trunk/bindings/c/xspf_c.h (from rev 512, trunk/bindings/c/spiff_c.h)
===================================================================
--- trunk/bindings/c/xspf_c.h (rev 0)
+++ trunk/bindings/c/xspf_c.h 2009-02-17 20:42:15 UTC (rev 513)
@@ -0,0 +1,198 @@
+/*
+ * spiff_c - Simple C interface for libSpiff
+ *
+ * Copyright (C) 2007, Ed Schouten / Xiph.Org Foundation
+ * Copyright (C) 2008, Sebastian Pipping / Xiph.Org Foundation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * * Neither the name of the Xiph.Org Foundation nor the names of
+ * its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written
+ * permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Ed Schouten <ed...@fx...>
+ * Sebastian Pipping <sp...@xi...>
+ */
+/**
+ * @file spiff_c.h
+ * @brief Simple libSpiff C bindings.
+ */
+
+#ifndef SPIFF_C_H
+#define SPIFF_C_H
+
+/**
+ * @brief Linked list for values inside tracks or lists with string
+ * values.
+ */
+struct spiff_mvalue {
+ /**
+ * @brief Value of the current list entry.
+ */
+ char *value;
+ /**
+ * @brief Pointer to next object in the list.
+ */
+ struct spiff_mvalue *next;
+
+ /**
+ * @brief Private data that can be freely used.
+ */
+ void *pdata;
+};
+
+/**
+ * @brief Single track in an XSPF list.
+ */
+struct spiff_track {
+ /**
+ * @brief Track's creator.
+ */
+ char *creator;
+ /**
+ * @brief Track's display name.
+ */
+ char *title;
+ /**
+ * @brief Album or collection of origin.
+ */
+ char *album;
+
+ /**
+ * @brief Track duration in milliseconds.
+ */
+ int duration;
+ /**
+ * @brief Track number.
+ */
+ int tracknum;
+
+ /**
+ * @brief Track's file locations.
+ */
+ struct spiff_mvalue *locations;
+ /**
+ * @brief Unique track identifiers.
+ */
+ struct spiff_mvalue *identifiers;
+
+ /**
+ * @brief Pointer to next track.
+ */
+ struct spiff_track *next;
+
+ /**
+ * @brief Private data that can be freely used.
+ */
+ void *pdata;
+};
+
+/**
+ * @brief Parsed XSPF file.
+ */
+struct spiff_list {
+ /**
+ * @brief Playlist's license.
+ */
+ char *license;
+ /**
+ * @brief Playlist's file location.
+ */
+ char *location;
+ /**
+ * @brief Playlist's unique indentifier.
+ */
+ char *identifier;
+
+ /**
+ * @brief Linked list of tracks inside the playlist.
+ */
+ struct spiff_track *tracks;
+
+ /**
+ * @brief Private data that can be freely used.
+ */
+ void *pdata;
+};
+
+/**
+ * @brief Easy interface for walking through tracks.
+ */
+#define SPIFF_LIST_FOREACH_TRACK(l,t) \
+ for ((t) = (l)->tracks; (t) != NULL; (t) = (t)->next)
+/**
+ * @brief Easy interface for walking through locations.
+ */
+#define SPIFF_TRACK_FOREACH_LOCATION(t,l) \
+ for ((l) = (t)->locations; (l) != NULL; (l) = (l)->next)
+/**
+ * @brief Easy interface for walking through identifiers.
+ */
+#define SPIFF_TRACK_FOREACH_IDENTIFIER(t,i) \
+ for ((i) = (t)->identifiers; (i) != NULL; (i) = (i)->next)
+
+/**
+ * @brief Parse an XSPF file by filename.
+ */
+struct spiff_list *spiff_parse(char const *filename, char const *baseuri);
+/**
+ * @brief Create a new empty XSPF playlist.
+ */
+struct spiff_list *spiff_new(void);
+/**
+ * @brief Free the parser results.
+ */
+void spiff_free(struct spiff_list *list);
+/**
+ * @brief Set or overwrite a value in the spiff_list, spiff_track or
+ * spiff_mvalue structures. Passing NULL will unset the string.
+ */
+void spiff_setvalue(char **str, char const *nstr);
+/**
+ * @brief Insert a new mvalue to the linked list before the specified
+ * one. This routine can also be used to insert a new mvalue to
+ * the end of the list (or an empty list) by passing the address
+ * of the mvalue list or the next field in the last object.
+ */
+struct spiff_mvalue *spiff_new_mvalue_before(
+ struct spiff_mvalue **mvalue);
+/**
+ * @brief Insert a new track to the linked list before the specified
+ * one. This routine can also be used to insert a new track to
+ * the end of the list (or an empty list) by passing the address
+ * of the track list or the next field in the last object.
+ */
+struct spiff_track *spiff_new_track_before(
+ struct spiff_track **track);
+/**
+ * @brief Write the Spiff playlist to a file.
+ */
+int spiff_write(struct spiff_list *list, char const *filename, char const *baseuri);
+
+#endif /* !SPIFF_C_H */
Copied: trunk/include/xspf/Xspf.h (from rev 512, trunk/include/spiff/Spiff.h)
===================================================================
--- trunk/include/xspf/Xspf.h (rev 0)
+++ trunk/include/xspf/Xspf.h 2009-02-17 20:42:15 UTC (rev 513)
@@ -0,0 +1,78 @@
+/*
+ * libSpiff - XSPF playlist handling library
+ *
+ * Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * * Neither the name of the Xiph.Org Foundation nor the names of
+ * its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written
+ * permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Sebastian Pipping, sp...@xi...
+ */
+
+/**
+ * @file Spiff.h
+ * Include-everything header for lazy people with fast machines.
+ */
+
+#ifndef SPIFF_H
+#define SPIFF_H
+
+
+/**
+ * @namespace Spiff
+ * Provides reading and writing functionality
+ * for both XSPF-0 and XSPF-1.
+ */
+
+// #include "Spiff.h"
+ #include "SpiffChunkCallback.h"
+// #include "SpiffData.h"
+ #include "SpiffDateTime.h"
+// #include "SpiffDefines.h"
+ #include "SpiffExtension.h"
+// #include "SpiffExtensionReader.h"
+ #include "SpiffExtensionReaderFactory.h"
+ #include "SpiffExtensionWriter.h"
+ #include "SpiffIndentFormatter.h"
+ #include "SpiffProps.h"
+ #include "SpiffReader.h"
+ #include "SpiffReaderCallback.h"
+ #include "SpiffSeamlessFormatter.h"
+ #include "SpiffStack.h"
+// #include "SpiffToolbox.h"
+ #include "SpiffTrack.h"
+// #include "SpiffVersion.h"
+ #include "SpiffWriter.h"
+// #include "SpiffXmlFormatter.h"
+
+
+#endif // SPIFF_H
Copied: trunk/include/xspf/XspfChunkCallback.h (from rev 512, trunk/include/spiff/SpiffChunkCallback.h)
===================================================================
--- trunk/include/xspf/XspfChunkCallback.h (rev 0)
+++ trunk/include/xspf/XspfChunkCallback.h 2009-02-17 20:42:15 UTC (rev 513)
@@ -0,0 +1,136 @@
+/*
+ * libSpiff - XSPF playlist handling library
+ *
+ * Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * * Neither the name of the Xiph.Org Foundation nor the names of
+ * its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written
+ * permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Sebastian Pipping, sp...@xi...
+ */
+
+/**
+ * @file SpiffChunkCallback.h
+ * Interface of SpiffChunkCallback.
+ */
+
+#ifndef SPIFF_CHUNK_CALLBACK_H
+#define SPIFF_CHUNK_CALLBACK_H
+
+
+namespace Spiff {
+
+
+class SpiffChunkCallbackPrivate;
+
+
+/**
+ * Hands out text chunks to a SpiffReader.
+ * This enables parsing from non-linear input
+ * structures. It can also be used to parse
+ * bug XSPF files in smaller chunks to lower
+ * memory usage.
+ */
+class SpiffChunkCallback {
+
+ friend class SpiffReader;
+
+private:
+ /// @cond DOXYGEN_NON_API
+ SpiffChunkCallbackPrivate * const d; ///< D pointer
+ /// @endcond
+
+protected:
+ /**
+ * Creates a new chunk callback.
+ */
+ SpiffChunkCallback();
+
+ /**
+ * Copy constructor.
+ *
+ * @param source Source to copy from
+ */
+ SpiffChunkCallback(SpiffChunkCallback const & source);
+
+ /**
+ * Assignment operator.
+ *
+ * @param source Source to copy from
+ */
+ SpiffChunkCallback & operator=(SpiffChunkCallback const & source);
+
+ /**
+ * Destroys this chunk callback.
+ */
+ virtual ~SpiffChunkCallback();
+
+ /**
+ * Returns the minimum size in bytes of the
+ * buffer handed to fillBuffer in a subsequent
+ * call.
+ *
+ * @return Size in bytes
+ */
+ virtual int getMinimumBufferByteSize() = 0;
+
+ /**
+ * Fulls <code>buffer</code> with a new
+ * chunk of input. the chunk copies must
+ * not exceed the number of bytes returned
+ * by the last call to getMinimumBufferByteSize.
+ * NOTE: You do <b>not</b> have to zero-terminate
+ * the string written. If you do so do not count
+ * this into the return value.
+ *
+ * @param buffer Buffer to write to
+ * @return Number of bytes actually written
+ */
+ virtual int fillBuffer(void * buffer) = 0;
+
+ /**
+ * Notifies this chunk callback, that
+ * no more chunks will be needed. You can close
+ * the resource read from in here.
+ */
+ virtual void notifyStop();
+
+ /// @cond DOXYGEN_NON_API
+ void virtualHook(int methodId, void * parameters);
+ /// @endcond
+
+};
+
+
+}
+
+#endif // SPIFF_CHUNK_CALLBACK_H
Copied: trunk/include/xspf/XspfData.h (from rev 512, trunk/include/spiff/SpiffData.h)
===================================================================
--- trunk/include/xspf/XspfData.h (rev 0)
+++ trunk/include/xspf/XspfData.h 2009-02-17 20:42:15 UTC (rev 513)
@@ -0,0 +1,511 @@
+/*
+ * libSpiff - XSPF playlist handling library
+ *
+ * Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * * Neither the name of the Xiph.Org Foundation nor the names of
+ * its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written
+ * permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Sebastian Pipping, sp...@xi...
+ */
+
+/**
+ * @file SpiffData.h
+ * Interface of SpiffData.
+ */
+
+#ifndef SPIFF_DATA_H
+#define SPIFF_DATA_H
+
+#include "SpiffDefines.h"
+#include <deque>
+
+namespace Spiff {
+
+
+class SpiffExtension;
+class SpiffDataPrivate;
+
+
+/**
+ * Provides shared functionality for SpiffTrack and SpiffProps.
+ */
+class SpiffData {
+
+ friend class SpiffDataPrivate;
+
+private:
+ /// @cond DOXYGEN_NON_API
+ SpiffDataPrivate * const d; ///< D pointer
+ /// @endcond
+
+protected:
+ /**
+ * Creates a new SpiffData object.
+ */
+ SpiffData();
+
+ /**
+ * Copy constructor.
+ *
+ * @param source Source to copy from
+ */
+ SpiffData(SpiffData const & source);
+
+ /**
+ * Assignment operator.
+ *
+ * @param source Source to copy from
+ */
+ SpiffData & operator=(SpiffData const & source);
+
+ /**
+ * Destroys this SpiffData object and deletes all
+ * memory associated with it that has not been stolen before.
+ */
+ virtual ~SpiffData();
+
+public:
+ /**
+ * Overwrites the image property. If <c>copy</c> is true
+ * the string will be copied, otherwise just assigned.
+ * In both cases the associated memory will be deleted on
+ * object destruction.
+ *
+ * @param image Image string to set
+ * @param copy Copy flag
+ */
+ void giveImage(XML_Char const * image, bool copy);
+
+ /**
+ * Overwrites the info property. If <c>copy</c> is true
+ * the string will be copied, otherwise just assigned.
+ * In both cases the associated memory will be deleted on
+ * object destruction.
+ *
+ * @param info Info string to set
+ * @param copy Copy flag
+ */
+ void giveInfo(XML_Char const * info, bool copy);
+
+ /**
+ * Overwrites the annotation property. If <c>copy</c> is true
+ * the string will be copied, otherwise just assigned.
+ * In both cases the associated memory will be deleted on
+ * object destruction.
+ *
+ * @param annotation Annotation string to set
+ * @param copy Copy flag
+ */
+ void giveAnnotation(XML_Char const * annotation, bool copy);
+
+ /**
+ * Overwrites the creator property. If <c>copy</c> is true
+ * the string will be copied, otherwise just assigned.
+ * In both cases the associated memory will be deleted on
+ * object destruction.
+ *
+ * @param creator Creator string to set
+ * @param copy Copy flag
+ */
+ void giveCreator(XML_Char const * creator, bool copy);
+
+ /**
+ * Overwrites the title property. If <c>copy</c> is true
+ * the string will be copied, otherwise just assigned.
+ * In both cases the associated memory will be deleted on
+ * object destruction.
+ *
+ * @param title Title string to set
+ * @param copy Copy flag
+ */
+ void giveTitle(XML_Char const * title, bool copy);
+
+ /**
+ * Appends a link to the link list.
+ *
+ * @param rel Link rel to append
+ * @param copyRel Rel copy flag
+ * @param content Link content to append
+ * @param copyContent Content copy flag
+ */
+ void giveAppendLink(XML_Char const * rel, bool copyRel, XML_Char const * content, bool copyContent);
+
+ /**
+ * Appends a meta to the meta list.
+ *
+ * @param rel Meta rel to append
+ * @param copyRel Rel copy flag
+ * @param content Meta content to append
+ * @param copyContent Content copy flag
+ */
+ void giveAppendMeta(XML_Char const * rel, bool copyRel, XML_Char const * content, bool copyContent);
+
+ /**
+ * Appends an extension to the extension list.
+ *
+ * @param extension Extension to append
+ * @param copy Copy flag
+ */
+ void giveAppendExtension(SpiffExtension const * extension, bool copy);
+
+ /**
+ * Overwrites the image property. The string is
+ * only assigned not copied. The ownership is
+ * not transferred.
+ *
+ * @param image Image string to set
+ */
+ void lendImage(XML_Char const * image);
+
+ /**
+ * Overwrites the info property. The string is
+ * only assigned not copied. The ownership is
+ * not transferred.
+ *
+ * @param info Info string to set
+ */
+ void lendInfo(XML_Char const * info);
+
+ /**
+ * Overwrites the annotation property. The string is
+ * only assigned not copied. The ownership is
+ * not transferred.
+ *
+ * @param annotation Annotation string to set
+ */
+ void lendAnnotation(XML_Char const * annotation);
+
+ /**
+ * Overwrites the creator property. The string is
+ * only assigned not copied. The ownership is
+ * not transferred.
+ *
+ * @param creator Creator string to set
+ */
+ void lendCreator(XML_Char const * creator);
+
+ /**
+ * Overwrites the title property. The string is
+ * only assigned not copied. The ownership is
+ * not transferred.
+ *
+ * @param title Title string to set
+ */
+ void lendTitle(XML_Char const * title);
+
+ /**
+ * Appends a link pair to the link list.
+ * The associated memory is neither copied nor
+ * deleted on onject destruction.
+ *
+ * @param rel Link rel to append
+ * @param content Link content to append
+ */
+ void lendAppendLink(XML_Char const * rel, XML_Char const * content);
+
+ /**
+ * Appends a meta pair to the meta list.
+ * The associated memory is neither copied nor
+ * deleted on onject destruction.
+ *
+ * @param rel Meta rel to append
+ * @param content Meta content to append
+ */
+ void lendAppendMeta(XML_Char const * rel, XML_Char const * content);
+
+ /**
+ * Appends an extension to the extension list.
+ * The associated memory is neither copied nor
+ * deleted on onject destruction.
+ *
+ * @param extension Extension to append
+ */
+ void lendAppendExtension(SpiffExtension * extension);
+
+ /**
+ * Steals the image property.
+ *
+ * @return Image URI, can be NULL
+ */
+ XML_Char * stealImage();
+
+ /**
+ * Steals the info property.
+ *
+ * @return Info URI, can be NULL
+ */
+ XML_Char * stealInfo();
+
+ /**
+ * Steals the annotation property.
+ *
+ * @return Annotation, can be NULL
+ */
+ XML_Char * stealAnnotation();
+
+ /**
+ * Steals the creator property.
+ *
+ * @return Creator, can be NULL
+ */
+ XML_Char * stealCreator();
+
+ /**
+ * Steals the title property.
+ *
+ * @return Title, can be NULL
+ */
+ XML_Char * stealTitle();
+
+ /**
+ * Steals the first link pair from the list.
+ * If the list is empty <c>NULL</c> is returned.
+ *
+ * NOTE: Do not forget to delete the pair!
+ *
+ * @return First link pair, can be NULL
+ */
+ std::pair<XML_Char *, XML_Char *> * stealFirstLink();
+
+ /**
+ * Steals the first meta pair from the list.
+ * If the list is empty <c>NULL</c> is returned.
+ *
+ * NOTE: Do not forget to delete the pair!
+ *
+ * @return First meta pair, can be NULL
+ */
+ std::pair<XML_Char *, XML_Char *> * stealFirstMeta();
+
+ /**
+ * Steals the extension from the list.
+ * If the list is empty <c>NULL</c> is returned.
+ *
+ * NOTE: Do not forget to delete the extension!
+ *
+ * @return First extension, can be NULL
+ */
+ SpiffExtension * stealFirstExtension();
+
+ /**
+ * Returns the image property.
+ *
+ * @return Image URI, can be NULL
+ */
+ XML_Char const * getImage() const;
+
+ /**
+ * Returns the info property.
+ *
+ * @return Info URI, can be NULL
+ */
+ XML_Char const * getInfo() const;
+
+ /**
+ * Returns the annotation property.
+ *
+ * @return Annotation, can be NULL
+ */
+ XML_Char const * getAnnotation() const;
+
+ /**
+ * Returns the creator property.
+ *
+ * @return Creator, can be NULL
+ */
+ XML_Char const * getCreator() const;
+
+ /**
+ * Returns the title property.
+ *
+ * @return Title, can be NULL
+ */
+ XML_Char const * getTitle() const;
+
+ /**
+ * Gets a specific link pair from the list.
+ * If the list is empty <c>NULL</c> is returned.
+ *
+ * NOTE: The returned pair has to be deleted manually!
+ *
+ * @return Specified link pair, can be NULL
+ */
+ std::pair<XML_Char const *, XML_Char const *> * getLink(int index) const;
+
+ /**
+ * Gets a specific meta pair from the list.
+ * If the list is empty <c>NULL</c> is returned.
+ *
+ * NOTE: The returned pair has to be deleted manually!
+ *
+ * @return Specified meta pair, can be NULL
+ */
+ std::pair<XML_Char const *, XML_Char const *> * getMeta(int index) const;
+
+ /**
+ * Gets a specific extension from the list.
+ * If the list is empty <c>NULL</c> is returned.
+ *
+ * NOTE: The returned extension has to be deleted manually!
+ *
+ * @return Specified extension, can be NULL
+ */
+ SpiffExtension const * getExtension(int index) const;
+
+ /**
+ * Returns the number of link pairs.
+ *
+ * @return Number of link pairs
+ */
+ int getLinkCount() const;
+
+ /**
+ * Returns the number of meta pairs.
+ *
+ * @return Number of meta pairs
+ */
+ int getMetaCount() const;
+
+ /**
+ * Returns the number of extensions.
+ *
+ * @return Number of extensions
+ */
+ int getExtensionCount() const;
+
+private:
+ /**
+ * Appends a meta or link pair to a container.
+ *
+ * @param container Container to work with
+ * @param rel Rel to append
+ * @param ownRel Rel ownership flag
+ * @param content Content to append
+ * @param ownContent Content ownership flag
+ */
+ static void appendHelper(std::deque<std::pair<
+ std::pair<XML_Char const *, bool> *,
+ std::pair<XML_Char const *, bool> *> *> * & container,
+ XML_Char const * rel,
+ bool ownRel,
+ XML_Char const * content,
+ bool ownContent);
+
+ /**
+ * Appends an extension to a container.
+ *
+ * @param container Container to work with
+ * @param extenstion Extenstion to append
+ * @param own Ownership flag
+ */
+ static void appendHelper(std::deque<
+ std::pair<SpiffExtension const *, bool> *> * & container,
+ SpiffExtension const * extenstion,
+ bool own);
+
+protected:
+ /**
+ * Steals a property. If the property's memory is not owned
+ * a clone is returned. In any case you own the memory
+ * return and have to delete it.
+ *
+ * @param property Property to steal
+ * @param own Owner flag
+ * @return Stolen property value, can be NULL
+ */
+ static XML_Char * stealHelper(XML_Char const * & property, bool own);
+
+private:
+ /**
+ * Steals the first entry from a container.
+ *
+ * @param container Container to steal from
+ * @return First entry, can be NULL
+ */
+ static std::pair<XML_Char *, XML_Char *> * stealFirstHelper(
+ std::deque<std::pair<std::pair<XML_Char const *, bool> *,
+ std::pair<XML_Char const *, bool> *> *> * & container);
+
+ /**
+ * Steals the first entry from a container.
+ *
+ * @param container Container to steal from
+ * @return First entry, can be NULL
+ */
+ static SpiffExtension * stealFirstHelper(std::deque<
+ std::pair<SpiffExtension const *, bool> *> * & container);
+
+ /**
+ * Returns a specific entry from a container
+ * or <c>NULL</c> if the entry does not exist.
+ *
+ * NOTE: The returned pair has to be deleted manually!
+ *
+ * @param container Container to work with
+ * @param index Index of the entry to return
+ * @return Entry content, can be NULL
+ */
+ static std::pair<XML_Char const *, XML_Char const *> * getHelper(
+ std::deque<std::pair<std::pair<XML_Char const *, bool> *,
+ std::pair<XML_Char const *, bool> *> *> * & container,
+ int index);
+
+ /**
+ * Returns a specific entry from a container
+ * or <c>NULL</c> if the entry does not exist.
+ *
+ * NOTE: The returned pair has to be deleted manually!
+ *
+ * @param container Container to work with
+ * @param index Index of the entry to return
+ * @return Entry content, can be NULL
+ */
+ static SpiffExtension const * getHelper(
+ std::deque<std::pair<SpiffExtension const *, bool> *> * & container,
+ int index);
+
+protected:
+ /// @cond DOXYGEN_NON_API
+ void virtualHook(int methodId, void * parameters);
+ /// @endcond
+
+public:
+ static bool const COPY; ///< Memory is copied
+ static bool const TRANSFER; ///< Memory ownership is transfered
+
+};
+
+
+}
+
+#endif // SPIFF_DATA_H
Copied: trunk/include/xspf/XspfDateTime.h (from rev 512, trunk/include/spiff/SpiffDateTime.h)
===================================================================
--- trunk/include/xspf/XspfDateTime.h (rev 0)
+++ trunk/include/xspf/XspfDateTime.h 2009-02-17 20:42:15 UTC (rev 513)
@@ -0,0 +1,246 @@
+/*
+ * libSpiff - XSPF playlist handling library
+ *
+ * Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * * Neither the name of the Xiph.Org Foundation nor the names of
+ * its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written
+ * permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Sebastian Pipping, sp...@xi...
+ */
+
+/**
+ * @file SpiffDateTime.h
+ * Interface of SpiffDateTime.
+ */
+
+#ifndef SPIFF_DATE_TIME_H
+#define SPIFF_DATE_TIME_H
+
+#include "SpiffDefines.h"
+
+
+namespace Spiff {
+
+
+class SpiffDateTimePrivate;
+
+
+/**
+ * Represents a "dateTime" timestamp
+ * without fractional second component.
+ */
+class SpiffDateTime {
+
+private:
+ /// @cond DOXYGEN_NON_API
+ SpiffDateTimePrivate * const d; ///< D pointer
+ /// @endcond
+
+public:
+ /**
+ * Creates a new dateTime timestamp.
+ * The given parameters must be valid and are not
+ * checked for validity inside.
+ *
+ * @param year Year [-9999..+9999] but not zero
+ * @param month Month [1..12]
+ * @param day Day [1..31]
+ * @param hour Hour [0..23]
+ * @param minutes Minutes [0..59]
+ * @param seconds Seconds [0..59]
+ * @param distHours Time shift hours [-14..+14]
+ * @param distMinutes Time shift minutes [-59..+59]
+ */
+ SpiffDateTime(int year, int month, int day, int hour, int minutes,
+ int seconds, int distHours, int distMinutes);
+
+ /**
+ * Creates a new dateTime timestamp.
+ */
+ SpiffDateTime();
+
+ /**
+ * Copy constructor.
+ *
+ * @param source Source to copy from
+ */
+ SpiffDateTime(SpiffDateTime const & source);
+
+ /**
+ * Assignment operator.
+ *
+ * @param source Source to copy from
+ */
+ SpiffDateTime & operator=(SpiffDateTime const & source);
+
+ /**
+ * Destroys this dateTime timestamp.
+ */
+ ~SpiffDateTime();
+
+ /**
+ * Clones this dateTime object.
+ *
+ *`@return Cloned object
+ */
+ SpiffDateTime * clone() const;
+
+ /**
+ * Returns the year.
+ *
+ * @return Year
+ */
+ int getYear() const;
+
+ /**
+ * Returns the month.
+ *
+ * @return Month
+ */
+ int getMonth() const;
+
+ /**
+ * Returns the day.
+ *
+ * @return Day
+ */
+ int getDay() const;
+
+ /**
+ * Returns the hour.
+ *
+ * @return Hour
+ */
+ int getHour() const;
+
+ /**
+ * Returns the minutes.
+ *
+ * @return Minutes
+ */
+ int getMinutes() const;
+
+ /**
+ * Returns the seconds.
+ *
+ * @return Seconds
+ */
+ int getSeconds() const;
+
+ /**
+ * Returns the time shift hours.
+ *
+ * @return Time shift hours
+ */
+ int getDistHours() const;
+
+ /**
+ * Returns the time shift minutes.
+ *
+ * @return Time shift minutes
+ */
+ int getDistMinutes() const;
+
+ /**
+ * Sets the year.
+ *
+ * @param year Year to set
+ */
+ void setYear(int year);
+
+ /**
+ * Sets the month.
+ *
+ * @param month Month to set
+ */
+ void setMonth(int month);
+
+ /**
+ * Sets the day.
+ *
+ * @param day Day to set
+ */
+ void setDay(int day);
+
+ /**
+ * Sets the hour.
+ *
+ * @param hour Hour to set
+ */
+ void setHour(int hour);
+
+ /**
+ * Sets the minutes.
+ *
+ * @param minutes Minutes to set
+ */
+ void setMinutes(int minutes);
+
+ /**
+ * Sets the seconds.
+ *
+ * @param seconds Seconds to set
+ */
+ void setSeconds(int seconds);
+
+ /**
+ * Sets the time shift hours.
+ *
+ * @param distHours Time shift hours
+ */
+ void setDistHours(int distHours);
+
+ /**
+ * Sets the time shift minutes.
+ *
+ * @param distMinutes Time shift minutes
+ */
+ void setDistMinutes(int distMinutes);
+
+ /**
+ * Extracts a dateTime from <c>text</c>.
+ *
+ * @param text Text
+ * @param output dateTime storage destination
+ * @return Valid dateTime flag
+ * @since 1.0.0rc1
+ */
+ static bool extractDateTime(XML_Char const * text,
+ SpiffDateTime * output);
+
+};
+
+
+} // namespace Spiff
+
+#endif // SPIFF_DATE_TIME_H
Copied: trunk/include/xspf/XspfDefines.h (from rev 512, trunk/include/spiff/SpiffDefines.h)
===================================================================
--- trunk/include/xspf/XspfDefines.h (rev 0)
+++ trunk/include/xspf/XspfDefines.h 2009-02-17 20:42:15 UTC (rev 513)
@@ -0,0 +1,145 @@
+/*
+ * libSpiff - XSPF playlist handling library
+ *
+ * Copyright (C) 2006-2008, Sebastian Pipping / Xiph.Org Foundation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * * Neither the name of the Xiph.Org Foundation nor the names of
+ * its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written
+ * pe...
[truncated message content] |
|
From: <har...@us...> - 2009-02-13 13:10:14
|
Revision: 512
http://libspiff.svn.sourceforge.net/libspiff/?rev=512&view=rev
Author: hartwork
Date: 2009-02-13 13:10:07 +0000 (Fri, 13 Feb 2009)
Log Message:
-----------
Update autogen.sh to r33575 of BRL-CAD
Modified Paths:
--------------
trunk/autogen.sh
Modified: trunk/autogen.sh
===================================================================
--- trunk/autogen.sh 2008-12-25 02:45:53 UTC (rev 511)
+++ trunk/autogen.sh 2009-02-13 13:10:07 UTC (rev 512)
@@ -1,7 +1,7 @@
#!/bin/sh
# a u t o g e n . s h
#
-# Copyright (c) 2005-2008 United States Government as represented by
+# Copyright (c) 2005-2009 United States Government as represented by
# the U.S. Army Research Laboratory.
#
# Redistribution and use in source and binary forms, with or without
@@ -985,16 +985,51 @@
fi
done
- ##########################################
- # make sure certain required files exist #
- ##########################################
- for file in AUTHORS COPYING ChangeLog INSTALL NEWS README ; do
- if test ! -f $file ; then
- $VERBOSE_ECHO "Touching ${file} since it does not exist"
- touch $file
+ ###########################################################
+ # make sure certain required files exist for GNU projects #
+ ###########################################################
+ _marker_found=""
+ _marker_found_message_intro='Detected non-GNU marker "'
+ _marker_found_message_mid='" in '
+ for marker in foreign cygnus ; do
+ _marker_found_message=${_marker_found_message_intro}${marker}${_marker_found_message_mid}
+ _marker_found="`grep 'AM_INIT_AUTOMAKE.*'${marker} $CONFIGURE`"
+ if [ ! "x$_marker_found" = "x" ] ; then
+ $VERBOSE_ECHO "${_marker_found_message}`basename \"$CONFIGURE\"`"
+ break
fi
+ if test -f "`dirname \"$CONFIGURE\"/Makefile.am`" ; then
+ _marker_found="`grep 'AUTOMAKE_OPTIONS.*'${marker} Makefile.am`"
+ if [ ! "x$_marker_found" = "x" ] ; then
+ $VERBOSE_ECHO "${_marker_found_message}Makefile.am"
+ break
+ fi
+ fi
done
+ if [ "x${_marker_found}" = "x" ] ; then
+ _suggest_foreign=no
+ for file in AUTHORS COPYING ChangeLog INSTALL NEWS README ; do
+ if [ ! -f $file ] ; then
+ $VERBOSE_ECHO "Touching ${file} since it does not exist"
+ _suggest_foreign=yes
+ touch $file
+ fi
+ done
+ if [ "x${_suggest_foreign}" = "xyes" ] ; then
+ $ECHO
+ $ECHO "Warning: Several files expected of projects that conform to the GNU"
+ $ECHO "coding standards were not found. The files were automatically added"
+ $ECHO "for you since you do not have a 'foreign' declaration specified."
+ $ECHO
+ $ECHO "Considered adding 'foreign' to AM_INIT_AUTOMAKE in `basename \"$CONFIGURE\"`"
+ if test -f "`dirname \"$CONFIGURE\"/Makefile.am`" ; then
+ $ECHO "or to AUTOMAKE_OPTIONS in your top-level Makefile.am file."
+ fi
+ $ECHO
+ fi
+ fi
+
##################################################
# make sure certain generated files do not exist #
##################################################
@@ -1067,7 +1102,7 @@
ret=1
for __cmd in wget curl fetch ; do
$VERBOSE_ECHO "Checking for command ${__cmd}"
- ${__cmd} --version &>/dev/null
+ ${__cmd} --version > /dev/null 2>&1
ret=$?
if [ ! $ret = 0 ] ; then
continue
@@ -1345,7 +1380,7 @@
$ECHO
$ECHO "Warning: Unsupported macros were found in $CONFIGURE"
$ECHO
- $ECHO "The `echo $CONFIGURE | basename` file was scanned in order to determine if any"
+ $ECHO "The `basename \"$CONFIGURE\"` file was scanned in order to determine if any"
$ECHO "unsupported macros are used that exceed the minimum version"
$ECHO "settings specified within this file. As such, the following macros"
$ECHO "should be removed from configure.ac or the version numbers in this"
@@ -1389,7 +1424,7 @@
$ECHO " $AUTOGEN_SH --verbose"
else
$ECHO "reviewing the minimum GNU Autotools version settings contained in"
- $ECHO "this script along with the macros being used in your `echo $CONFIGURE | basename` file."
+ $ECHO "this script along with the macros being used in your `basename \"$CONFIGURE\"` file."
fi
$ECHO
$ECHO $ECHO_N "Continuing build preparation ... $ECHO_C"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <har...@us...> - 2008-12-25 02:45:57
|
Revision: 511
http://libspiff.svn.sourceforge.net/libspiff/?rev=511&view=rev
Author: hartwork
Date: 2008-12-25 02:45:53 +0000 (Thu, 25 Dec 2008)
Log Message:
-----------
Add LinuxLink port
Modified Paths:
--------------
website/index.html
Modified: website/index.html
===================================================================
--- website/index.html 2008-12-13 18:35:42 UTC (rev 510)
+++ website/index.html 2008-12-25 02:45:53 UTC (rev 511)
@@ -89,6 +89,7 @@
<li><a href="http://pkgbox.dragonflybsd.org/packages/DragonFly-2.0/pkgsrc-2008Q2/audio/" target="_blank">DragonFly BSD</a></li>
<li><a href="http://www.freebsd.org/cgi/cvsweb.cgi/ports/multimedia/libspiff/" target="_blank">FreeBSD</a> (Ed Schouten)</li>
<li><a href="http://packages.gentoo.org/package/media-libs/libspiff" target="_blank">Gentoo Linux</a> (Robert Buchholz)</li>
+ <li><a href="https://src.timesys.com/svn/published/factory/builder/target/software/Multimedia/libspiff/" target="_blank">LinuxLink</a></li>
<li><a href="http://trac.macports.org/projects/macports/browser/trunk/dports/devel/libspiff" target="_blank">MacPorts</a> (Ed Schouten)</li>
<li><a href="http://dev.openbossa.org/trac/mamona/browser/packages/libspiff" target="_blank">Mamona</a> (Dr. Michael Lauer)</li>
<li><a href="http://pkgsrc.se/audio/libspiff" target="_blank">NetBSD</a> (Blair Sadewitz)</li>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <har...@us...> - 2008-12-13 18:35:47
|
Revision: 510
http://libspiff.svn.sourceforge.net/libspiff/?rev=510&view=rev
Author: hartwork
Date: 2008-12-13 18:35:42 +0000 (Sat, 13 Dec 2008)
Log Message:
-----------
Update autogen.sh
Modified Paths:
--------------
trunk/autogen.sh
Modified: trunk/autogen.sh
===================================================================
--- trunk/autogen.sh 2008-12-03 21:56:50 UTC (rev 509)
+++ trunk/autogen.sh 2008-12-13 18:35:42 UTC (rev 510)
@@ -1,7 +1,7 @@
#!/bin/sh
# a u t o g e n . s h
#
-# Copyright (c) 2005-2007 United States Government as represented by
+# Copyright (c) 2005-2008 United States Government as represented by
# the U.S. Army Research Laboratory.
#
# Redistribution and use in source and binary forms, with or without
@@ -102,7 +102,7 @@
fi
# extract version from CVS Id string
- __id="$Id: autogen.sh,v 14.97 2007/06/18 22:25:02 brlcad Exp $"
+ __id="$Id$"
__version="`echo $__id | sed 's/.*\([0-9][0-9][0-9][0-9]\)[-\/]\([0-9][0-9]\)[-\/]\([0-9][0-9]\).*/\1\2\3/'`"
if [ "x$__version" = "x" ] ; then
__version=""
@@ -119,11 +119,12 @@
# USAGE FUNCTION #
##################
usage ( ) {
- echo "Usage: $AUTOGEN_SH [-h|--help] [-v|--verbose] [-q|--quiet] [--version]"
- echo " --help Help on $NAME_OF_AUTOGEN usage"
- echo " --verbose Verbose progress output"
- echo " --quiet Quiet suppressed progress output"
- echo " --version Only perform GNU Build System version checks"
+ echo "Usage: $AUTOGEN_SH [-h|--help] [-v|--verbose] [-q|--quiet] [-d|--download] [--version]"
+ echo " --help Help on $NAME_OF_AUTOGEN usage"
+ echo " --verbose Verbose progress output"
+ echo " --quiet Quiet suppressed progress output"
+ echo " --download Download the latest config.guess from gnulib"
+ echo " --version Only perform GNU Build System version checks"
echo
echo "Description: This script will validate that minimum versions of the"
echo "GNU Build System tools are installed and then run autoreconf for you."
@@ -273,6 +274,9 @@
if [ "x$VERSION_ONLY" = "x" ] ; then
VERSION_ONLY=no
fi
+if [ "x$DOWNLOAD" = "x" ] ; then
+ DOWNLOAD=no
+fi
if [ "x$AUTORECONF_OPTIONS" = "x" ] ; then
AUTORECONF_OPTIONS="-i -f"
fi
@@ -293,6 +297,9 @@
if [ "x$AUTOHEADER_OPTIONS" = "x" ] ; then
AUTOHEADER_OPTIONS=""
fi
+if [ "x$CONFIG_GUESS_URL" = "x" ] ; then
+ CONFIG_GUESS_URL="http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;f=build-aux/config.guess;hb=HEAD"
+fi
for arg in $ARGS ; do
case "x$arg" in
x--help) HELP=yes ;;
@@ -300,6 +307,8 @@
x--quiet) QUIET=yes ;;
x-[qQ]) QUIET=yes ;;
x--verbose) VERBOSE=yes ;;
+ x-[dD]) DOWNLOAD=yes ;;
+ x--download) DOWNLOAD=yes ;;
x-[vV]) VERBOSE=yes ;;
x--version) VERSION_ONLY=yes ;;
*)
@@ -589,7 +598,7 @@
_version="0.0.0"
fi
$ECHO "Found GNU Automake version $_version"
- version_check "$AUTOMAKE_VERSION" "$_version"
+ version_check "$AUTOMAKE_VERSION" "$_version"
if [ $? -ne 0 ] ; then
_report_error=yes
fi
@@ -691,7 +700,7 @@
_version="0.0.0"
fi
$ECHO "Found GNU Libtool version $_version"
- version_check "$LIBTOOL_VERSION" "$_version"
+ version_check "$LIBTOOL_VERSION" "$_version"
if [ $? -ne 0 ] ; then
_report_error=yes
fi
@@ -1049,10 +1058,12 @@
# DOWNLOAD_GNULIB_CONFIG_GUESS FUNCTION #
#########################################
+# TODO - should make sure wget/curl exist and/or work before trying to
+# use them.
+
download_gnulib_config_guess () {
# abuse gitweb to download gnulib's latest config.guess via HTTP
- config_guess_url='http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;f=build-aux/config.guess;hb=HEAD'
- config_guess_temp=`mktemp`
+ config_guess_temp="config.guess.$$.download"
ret=1
for __cmd in wget curl fetch ; do
$VERBOSE_ECHO "Checking for command ${__cmd}"
@@ -1065,30 +1076,30 @@
__cmd_version=`${__cmd} --version | head -n 1 | sed -e 's/^[^0-9]\+//' -e 's/ .*//'`
$VERBOSE_ECHO "Found ${__cmd} ${__cmd_version}"
- $VERBOSE_ECHO "Downloading gnulib's latest config.guess"
+ opts=""
case ${__cmd} in
wget)
- wget "${config_guess_url}" -O "${config_guess_temp}" &>/dev/null
- ret=$?
+ opts="-O"
;;
curl)
- curl "${config_guess_url}" -o "${config_guess_temp}" &>/dev/null
- ret=$?
+ opts="-o"
;;
fetch)
- fetch "${config_guess_url}" -t 5 -f "${config_guess_temp}" &>/dev/null
- ret=$?
+ opts="-t 5 -f"
;;
esac
- if [ $ret = 0 ] ; then
+ $VERBOSE_ECHO "Running $__cmd \"${CONFIG_GUESS_URL}\" $opts \"${config_guess_temp}\""
+ eval "$__cmd \"${CONFIG_GUESS_URL}\" $opts \"${config_guess_temp}\"" > /dev/null 2>&1
+ if [ $? = 0 ] ; then
mv -f "${config_guess_temp}" ${_aux_dir}/config.guess
+ ret=0
break
fi
done
if [ ! $ret = 0 ] ; then
- $ECHO "Warning: config.guess download failed"
+ $ECHO "Warning: config.guess download failed from: $CONFIG_GUESS_URL"
rm -f "${config_guess_temp}"
fi
}
@@ -1098,12 +1109,12 @@
# LIBTOOLIZE_NEEDED FUNCTION #
##############################
libtoolize_needed () {
- ret=1 # means no
+ ret=1 # means no, don't need libtoolize
for feature in AC_PROG_LIBTOOL LT_INIT ; do
$VERBOSE_ECHO "Searching for $feature in $CONFIGURE"
found="`grep \"^$feature.*\" $CONFIGURE`"
if [ ! "x$found" = "x" ] ; then
- ret=0 # means yes
+ ret=0 # means yes, need to run libtoolize
break
fi
done
@@ -1156,8 +1167,10 @@
$ECHO "Attempting to run the preparation steps individually"
reconfigure_manually=yes
else
- if libtoolize_needed ; then
- download_gnulib_config_guess
+ if [ "x$DOWNLOAD" = "xyes" ] ; then
+ if libtoolize_needed ; then
+ download_gnulib_config_guess
+ fi
fi
fi
else
@@ -1243,7 +1256,7 @@
libtoolize_output="`$LIBTOOLIZE $LIBTOOLIZE_OPTIONS 2>&1`"
ret=$?
$VERBOSE_ECHO "$libtoolize_output"
-
+
if [ ! $ret = 0 ] ; then $ECHO "ERROR: $LIBTOOLIZE failed" && exit 2 ; fi
else
if [ "x$HAVE_ALT_LIBTOOLIZE" = "xyes" ] ; then
@@ -1251,7 +1264,7 @@
libtoolize_output="`$LIBTOOLIZE $ALT_LIBTOOLIZE_OPTIONS 2>&1`"
ret=$?
$VERBOSE_ECHO "$libtoolize_output"
-
+
if [ ! $ret = 0 ] ; then $ECHO "ERROR: $LIBTOOLIZE failed" && exit 2 ; fi
fi
fi
@@ -1280,7 +1293,9 @@
fi
fi # ltmain.sh
- download_gnulib_config_guess
+ if [ "x$DOWNLOAD" = "xyes" ] ; then
+ download_gnulib_config_guess
+ fi
fi # libtoolize_needed
############
@@ -1301,7 +1316,7 @@
macros_to_search=""
ac_major="`echo ${AUTOCONF_VERSION}. | cut -d. -f1 | sed 's/[^0-9]//g'`"
ac_minor="`echo ${AUTOCONF_VERSION}. | cut -d. -f2 | sed 's/[^0-9]//g'`"
-
+
if [ $ac_major -lt 2 ] ; then
macros_to_search="$ac2_59_macros $ac2_55_macros $ac2_54_macros"
else
@@ -1419,7 +1434,7 @@
automake_output="`$AUTOMAKE $AUTOMAKE_OPTIONS 2>&1`"
ret=$?
$VERBOSE_ECHO "$automake_output"
-
+
if [ ! $ret = 0 ] ; then
###################
@@ -1431,7 +1446,7 @@
automake_output="`$AUTOMAKE $ALT_AUTOMAKE_OPTIONS 2>&1`"
ret=$?
$VERBOSE_ECHO "$automake_output"
-
+
if [ ! $ret = 0 ] ; then
# test if libtool is busted
libtool_failure "$automake_output"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <har...@us...> - 2008-12-03 21:56:55
|
Revision: 509
http://libspiff.svn.sourceforge.net/libspiff/?rev=509&view=rev
Author: hartwork
Date: 2008-12-03 21:56:50 +0000 (Wed, 03 Dec 2008)
Log Message:
-----------
Build system changes:
- Nested configure migration
- Configure option --enable-doc
- Qt Assistant documentation output (.qch/.qhp)
- autogen.sh to replace custom boostrap.sh
Modified Paths:
--------------
trunk/ChangeLog
trunk/Makefile.am
trunk/TODO.txt
trunk/configure.ac
trunk/doc/Makefile.am
trunk/scripts/edit_version.sh
trunk/scripts/release.sh
Added Paths:
-----------
trunk/autogen.sh
trunk/bindings/c/doc/Doxyfile.in
trunk/bindings/c/doc/configure.ac
trunk/doc/Doxyfile.in
trunk/doc/configure.ac
Removed Paths:
-------------
trunk/bindings/c/doc/Doxyfile
trunk/bindings/c/doc/bootstrap.sh
trunk/bindings/c/doc/configure.in
trunk/bootstrap.sh
trunk/doc/Doxyfile
trunk/doc/bootstrap.sh
trunk/doc/configure.in
Property Changed:
----------------
trunk/bindings/c/doc/
trunk/doc/
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-11-20 14:27:50 UTC (rev 508)
+++ trunk/ChangeLog 2008-12-03 21:56:50 UTC (rev 509)
@@ -8,8 +8,18 @@
* Fixed: Test suite compile fix for GCC 4.3
Thanks to Alexis Ballier for the patch!
* Changed: Build system changes:
+ - configure option --enable-doc added
- configure.in renamed to configure.ac
- some Autotools files moved to build-aux directory
+ * Added: Qt Assistant documentation output:
+ - Qt Compressed Help (.qch) at
+ * doc/libspiff-doc-*.qch
+ * bindings/c/doc/spiff_c-doc-*.qch
+ - Qt Help Project (.qhp) at
+ * doc/html/index.qhp
+ * bindings/c/doc/html/index.qhp
+ Generation requires Doxygen 1.5.7.1-20081103 or later.
+ * Soname: 4:1:0
2008-09-21 -- 1.0.0
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2008-11-20 14:27:50 UTC (rev 508)
+++ trunk/Makefile.am 2008-12-03 21:56:50 UTC (rev 509)
@@ -1,6 +1,14 @@
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = 1.10.1 gnu dist-zip dist-bzip2 dist-lzma subdir-objects
+## Makefile.am
+if GENERATE_DOC
+SUBDIRS = \
+ . \
+ doc \
+ bindings/c/doc
+endif
+
lib_LTLIBRARIES = libspiff.la
bin_PROGRAMS = \
@@ -24,7 +32,7 @@
-libspiff_la_LDFLAGS = -version-info 4:0:0
+libspiff_la_LDFLAGS = -version-info 4:1:0
libspiff_la_SOURCES = \
src/SpiffChunkCallback.cpp \
Modified: trunk/TODO.txt
===================================================================
--- trunk/TODO.txt 2008-11-20 14:27:50 UTC (rev 508)
+++ trunk/TODO.txt 2008-12-03 21:56:50 UTC (rev 509)
@@ -1,8 +1,7 @@
== BEFORE NEXT RELEASE ==
+ * Finish Zirkoros extension
* xml:id support for SpiffTrack
== SOON ==
* @since tags everywhere
* input output parameter tags
- * update boostrap scripts to state of uriparser
- * nested configure as with uriparser?
Added: trunk/autogen.sh
===================================================================
--- trunk/autogen.sh (rev 0)
+++ trunk/autogen.sh 2008-12-03 21:56:50 UTC (rev 509)
@@ -0,0 +1,1528 @@
+#!/bin/sh
+# a u t o g e n . s h
+#
+# Copyright (c) 2005-2007 United States Government as represented by
+# the U.S. Army Research Laboratory.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following
+# disclaimer in the documentation and/or other materials provided
+# with the distribution.
+#
+# 3. The name of the author may not be used to endorse or promote
+# products derived from this software without specific prior written
+# permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+###
+#
+# Script for automatically preparing the sources for compilation by
+# performing the myrid of necessary steps. The script attempts to
+# detect proper version support, and outputs warnings about particular
+# systems that have autotool peculiarities.
+#
+# Basically, if everything is set up and installed correctly, the
+# script will validate that minimum versions of the GNU Build System
+# tools are installed, account for several common configuration
+# issues, and then simply run autoreconf for you.
+#
+# If autoreconf fails, which can happen for many valid configurations,
+# this script proceeds to run manual preparation steps effectively
+# providing a POSIX shell script (mostly complete) reimplementation of
+# autoreconf.
+#
+# The AUTORECONF, AUTOCONF, AUTOMAKE, LIBTOOLIZE, ACLOCAL, AUTOHEADER
+# environment variables and corresponding _OPTIONS variables (e.g.
+# AUTORECONF_OPTIONS) may be used to override the default automatic
+# detection behaviors. Similarly the _VERSION variables will override
+# the minimum required version numbers.
+#
+# Examples:
+#
+# To obtain help on usage:
+# ./autogen.sh --help
+#
+# To obtain verbose output:
+# ./autogen.sh --verbose
+#
+# To skip autoreconf and prepare manually:
+# AUTORECONF=false ./autogen.sh
+#
+# To verbosely try running with an older (unsupported) autoconf:
+# AUTOCONF_VERSION=2.50 ./autogen.sh --verbose
+#
+# Author:
+# Christopher Sean Morrison <mor...@br...>
+#
+# Patches:
+# Sebastian Pipping <seb...@pi...>
+#
+######################################################################
+
+# set to minimum acceptible version of autoconf
+if [ "x$AUTOCONF_VERSION" = "x" ] ; then
+ AUTOCONF_VERSION=2.52
+fi
+# set to minimum acceptible version of automake
+if [ "x$AUTOMAKE_VERSION" = "x" ] ; then
+ AUTOMAKE_VERSION=1.6.0
+fi
+# set to minimum acceptible version of libtool
+if [ "x$LIBTOOL_VERSION" = "x" ] ; then
+ LIBTOOL_VERSION=1.4.2
+fi
+
+
+##################
+# ident function #
+##################
+ident ( ) {
+ # extract copyright from header
+ __copyright="`grep Copyright $AUTOGEN_SH | head -${HEAD_N}1 | awk '{print $4}'`"
+ if [ "x$__copyright" = "x" ] ; then
+ __copyright="`date +%Y`"
+ fi
+
+ # extract version from CVS Id string
+ __id="$Id: autogen.sh,v 14.97 2007/06/18 22:25:02 brlcad Exp $"
+ __version="`echo $__id | sed 's/.*\([0-9][0-9][0-9][0-9]\)[-\/]\([0-9][0-9]\)[-\/]\([0-9][0-9]\).*/\1\2\3/'`"
+ if [ "x$__version" = "x" ] ; then
+ __version=""
+ fi
+
+ echo "autogen.sh build preparation script by Christopher Sean Morrison"
+ echo " + config.guess download patch by Sebastian Pipping (2008-12-03)"
+ echo "revised 3-clause BSD-style license, copyright (c) $__copyright"
+ echo "script version $__version, ISO/IEC 9945 POSIX shell script"
+}
+
+
+##################
+# USAGE FUNCTION #
+##################
+usage ( ) {
+ echo "Usage: $AUTOGEN_SH [-h|--help] [-v|--verbose] [-q|--quiet] [--version]"
+ echo " --help Help on $NAME_OF_AUTOGEN usage"
+ echo " --verbose Verbose progress output"
+ echo " --quiet Quiet suppressed progress output"
+ echo " --version Only perform GNU Build System version checks"
+ echo
+ echo "Description: This script will validate that minimum versions of the"
+ echo "GNU Build System tools are installed and then run autoreconf for you."
+ echo "Should autoreconf fail, manual preparation steps will be run"
+ echo "potentially accounting for several common preparation issues. The"
+
+ echo "AUTORECONF, AUTOCONF, AUTOMAKE, LIBTOOLIZE, ACLOCAL, AUTOHEADER,"
+ echo "PROJECT, & CONFIGURE environment variables and corresponding _OPTIONS"
+ echo "variables (e.g. AUTORECONF_OPTIONS) may be used to override the"
+ echo "default automatic detection behavior."
+ echo
+
+ ident
+
+ return 0
+}
+
+
+##########################
+# VERSION_ERROR FUNCTION #
+##########################
+version_error ( ) {
+ if [ "x$1" = "x" ] ; then
+ echo "INTERNAL ERROR: version_error was not provided a version"
+ exit 1
+ fi
+ if [ "x$2" = "x" ] ; then
+ echo "INTERNAL ERROR: version_error was not provided an application name"
+ exit 1
+ fi
+ $ECHO
+ $ECHO "ERROR: To prepare the ${PROJECT} build system from scratch,"
+ $ECHO " at least version $1 of $2 must be installed."
+ $ECHO
+ $ECHO "$NAME_OF_AUTOGEN does not need to be run on the same machine that will"
+ $ECHO "run configure or make. Either the GNU Autotools will need to be installed"
+ $ECHO "or upgraded on this system, or $NAME_OF_AUTOGEN must be run on the source"
+ $ECHO "code on another system and then transferred to here. -- Cheers!"
+ $ECHO
+}
+
+##########################
+# VERSION_CHECK FUNCTION #
+##########################
+version_check ( ) {
+ if [ "x$1" = "x" ] ; then
+ echo "INTERNAL ERROR: version_check was not provided a minimum version"
+ exit 1
+ fi
+ _min="$1"
+ if [ "x$2" = "x" ] ; then
+ echo "INTERNAL ERROR: version check was not provided a comparison version"
+ exit 1
+ fi
+ _cur="$2"
+
+ # needed to handle versions like 1.10 and 1.4-p6
+ _min="`echo ${_min}. | sed 's/[^0-9]/./g' | sed 's/\.\././g'`"
+ _cur="`echo ${_cur}. | sed 's/[^0-9]/./g' | sed 's/\.\././g'`"
+
+ _min_major="`echo $_min | cut -d. -f1`"
+ _min_minor="`echo $_min | cut -d. -f2`"
+ _min_patch="`echo $_min | cut -d. -f3`"
+
+ _cur_major="`echo $_cur | cut -d. -f1`"
+ _cur_minor="`echo $_cur | cut -d. -f2`"
+ _cur_patch="`echo $_cur | cut -d. -f3`"
+
+ if [ "x$_min_major" = "x" ] ; then
+ _min_major=0
+ fi
+ if [ "x$_min_minor" = "x" ] ; then
+ _min_minor=0
+ fi
+ if [ "x$_min_patch" = "x" ] ; then
+ _min_patch=0
+ fi
+ if [ "x$_cur_minor" = "x" ] ; then
+ _cur_major=0
+ fi
+ if [ "x$_cur_minor" = "x" ] ; then
+ _cur_minor=0
+ fi
+ if [ "x$_cur_patch" = "x" ] ; then
+ _cur_patch=0
+ fi
+
+ $VERBOSE_ECHO "Checking if ${_cur_major}.${_cur_minor}.${_cur_patch} is greater than ${_min_major}.${_min_minor}.${_min_patch}"
+
+ if [ $_min_major -lt $_cur_major ] ; then
+ return 0
+ elif [ $_min_major -eq $_cur_major ] ; then
+ if [ $_min_minor -lt $_cur_minor ] ; then
+ return 0
+ elif [ $_min_minor -eq $_cur_minor ] ; then
+ if [ $_min_patch -lt $_cur_patch ] ; then
+ return 0
+ elif [ $_min_patch -eq $_cur_patch ] ; then
+ return 0
+ fi
+ fi
+ fi
+ return 1
+}
+
+
+######################################
+# LOCATE_CONFIGURE_TEMPLATE FUNCTION #
+######################################
+locate_configure_template ( ) {
+ _pwd="`pwd`"
+ if test -f "./configure.ac" ; then
+ echo "./configure.ac"
+ elif test -f "./configure.in" ; then
+ echo "./configure.in"
+ elif test -f "$_pwd/configure.ac" ; then
+ echo "$_pwd/configure.ac"
+ elif test -f "$_pwd/configure.in" ; then
+ echo "$_pwd/configure.in"
+ elif test -f "$PATH_TO_AUTOGEN/configure.ac" ; then
+ echo "$PATH_TO_AUTOGEN/configure.ac"
+ elif test -f "$PATH_TO_AUTOGEN/configure.in" ; then
+ echo "$PATH_TO_AUTOGEN/configure.in"
+ fi
+}
+
+
+##################
+# argument check #
+##################
+ARGS="$*"
+PATH_TO_AUTOGEN="`dirname $0`"
+NAME_OF_AUTOGEN="`basename $0`"
+AUTOGEN_SH="$PATH_TO_AUTOGEN/$NAME_OF_AUTOGEN"
+
+LIBTOOL_M4="${PATH_TO_AUTOGEN}/misc/libtool.m4"
+
+if [ "x$HELP" = "x" ] ; then
+ HELP=no
+fi
+if [ "x$QUIET" = "x" ] ; then
+ QUIET=no
+fi
+if [ "x$VERBOSE" = "x" ] ; then
+ VERBOSE=no
+fi
+if [ "x$VERSION_ONLY" = "x" ] ; then
+ VERSION_ONLY=no
+fi
+if [ "x$AUTORECONF_OPTIONS" = "x" ] ; then
+ AUTORECONF_OPTIONS="-i -f"
+fi
+if [ "x$AUTOCONF_OPTIONS" = "x" ] ; then
+ AUTOCONF_OPTIONS="-f"
+fi
+if [ "x$AUTOMAKE_OPTIONS" = "x" ] ; then
+ AUTOMAKE_OPTIONS="-a -c -f"
+fi
+ALT_AUTOMAKE_OPTIONS="-a -c"
+if [ "x$LIBTOOLIZE_OPTIONS" = "x" ] ; then
+ LIBTOOLIZE_OPTIONS="--automake -c -f"
+fi
+ALT_LIBTOOLIZE_OPTIONS="--automake --copy --force"
+if [ "x$ACLOCAL_OPTIONS" = "x" ] ; then
+ ACLOCAL_OPTIONS=""
+fi
+if [ "x$AUTOHEADER_OPTIONS" = "x" ] ; then
+ AUTOHEADER_OPTIONS=""
+fi
+for arg in $ARGS ; do
+ case "x$arg" in
+ x--help) HELP=yes ;;
+ x-[hH]) HELP=yes ;;
+ x--quiet) QUIET=yes ;;
+ x-[qQ]) QUIET=yes ;;
+ x--verbose) VERBOSE=yes ;;
+ x-[vV]) VERBOSE=yes ;;
+ x--version) VERSION_ONLY=yes ;;
+ *)
+ echo "Unknown option: $arg"
+ echo
+ usage
+ exit 1
+ ;;
+ esac
+done
+
+
+#####################
+# environment check #
+#####################
+
+# sanity check before recursions potentially begin
+if [ ! -f "$AUTOGEN_SH" ] ; then
+ echo "INTERNAL ERROR: $AUTOGEN_SH does not exist"
+ if [ ! "x$0" = "x$AUTOGEN_SH" ] ; then
+ echo "INTERNAL ERROR: dirname/basename inconsistency: $0 != $AUTOGEN_SH"
+ fi
+ exit 1
+fi
+
+# force locale setting to C so things like date output as expected
+LC_ALL=C
+
+# commands that this script expects
+for __cmd in echo head tail pwd ; do
+ echo "test" | $__cmd > /dev/null 2>&1
+ if [ $? != 0 ] ; then
+ echo "INTERNAL ERROR: '${__cmd}' command is required"
+ exit 2
+ fi
+done
+echo "test" | grep "test" > /dev/null 2>&1
+if test ! x$? = x0 ; then
+ echo "INTERNAL ERROR: grep command is required"
+ exit 1
+fi
+echo "test" | sed "s/test/test/" > /dev/null 2>&1
+if test ! x$? = x0 ; then
+ echo "INTERNAL ERROR: sed command is required"
+ exit 1
+fi
+
+
+# determine the behavior of echo
+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+ *c*,-n*) ECHO_N= ECHO_C='
+' ECHO_T=' ' ;;
+ *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+ *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
+esac
+
+# determine the behavior of head
+case "x`echo 'head' | head -n 1 2>&1`" in
+ *xhead*) HEAD_N="n " ;;
+ *) HEAD_N="" ;;
+esac
+
+# determine the behavior of tail
+case "x`echo 'tail' | tail -n 1 2>&1`" in
+ *xtail*) TAIL_N="n " ;;
+ *) TAIL_N="" ;;
+esac
+
+VERBOSE_ECHO=:
+ECHO=:
+if [ "x$QUIET" = "xyes" ] ; then
+ if [ "x$VERBOSE" = "xyes" ] ; then
+ echo "Verbose output quelled by quiet option. Further output disabled."
+ fi
+else
+ ECHO=echo
+ if [ "x$VERBOSE" = "xyes" ] ; then
+ echo "Verbose output enabled"
+ VERBOSE_ECHO=echo
+ fi
+fi
+
+
+# allow a recursive run to disable further recursions
+if [ "x$RUN_RECURSIVE" = "x" ] ; then
+ RUN_RECURSIVE=yes
+fi
+
+
+################################################
+# check for help arg and bypass version checks #
+################################################
+if [ "x`echo $ARGS | sed 's/.*[hH][eE][lL][pP].*/help/'`" = "xhelp" ] ; then
+ HELP=yes
+fi
+if [ "x$HELP" = "xyes" ] ; then
+ usage
+ $ECHO "---"
+ $ECHO "Help was requested. No preparation or configuration will be performed."
+ exit 0
+fi
+
+
+#######################
+# set up signal traps #
+#######################
+untrap_abnormal ( ) {
+ for sig in 1 2 13 15; do
+ trap - $sig
+ done
+}
+
+# do this cleanup whenever we exit.
+trap '
+ # start from the root
+ if test -d "$START_PATH" ; then
+ cd "$START_PATH"
+ fi
+
+ # restore/delete backup files
+ if test "x$PFC_INIT" = "x1" ; then
+ recursive_restore
+ fi
+' 0
+
+# trap SIGHUP (1), SIGINT (2), SIGPIPE (13), SIGTERM (15)
+for sig in 1 2 13 15; do
+ trap '
+ $ECHO ""
+ $ECHO "Aborting $NAME_OF_AUTOGEN: caught signal '$sig'"
+
+ # start from the root
+ if test -d "$START_PATH" ; then
+ cd "$START_PATH"
+ fi
+
+ # clean up on abnormal exit
+ $VERBOSE_ECHO "rm -rf autom4te.cache"
+ rm -rf autom4te.cache
+
+ if test -f "acinclude.m4.$$.backup" ; then
+ $VERBOSE_ECHO "cat acinclude.m4.$$.backup > acinclude.m4"
+ chmod u+w acinclude.m4
+ cat acinclude.m4.$$.backup > acinclude.m4
+
+ $VERBOSE_ECHO "rm -f acinclude.m4.$$.backup"
+ rm -f acinclude.m4.$$.backup
+ fi
+
+ { (exit 1); exit 1; }
+' $sig
+done
+
+
+#############################
+# look for a configure file #
+#############################
+if [ "x$CONFIGURE" = "x" ] ; then
+ CONFIGURE="`locate_configure_template`"
+ if [ ! "x$CONFIGURE" = "x" ] ; then
+ $VERBOSE_ECHO "Found a configure template: $CONFIGURE"
+ fi
+else
+ $ECHO "Using CONFIGURE environment variable override: $CONFIGURE"
+fi
+if [ "x$CONFIGURE" = "x" ] ; then
+ if [ "x$VERSION_ONLY" = "xyes" ] ; then
+ CONFIGURE=/dev/null
+ else
+ $ECHO
+ $ECHO "A configure.ac or configure.in file could not be located implying"
+ $ECHO "that the GNU Build System is at least not used in this directory. In"
+ $ECHO "any case, there is nothing to do here without one of those files."
+ $ECHO
+ $ECHO "ERROR: No configure.in or configure.ac file found in `pwd`"
+ exit 1
+ fi
+fi
+
+####################
+# get project name #
+####################
+if [ "x$PROJECT" = "x" ] ; then
+ PROJECT="`grep AC_INIT $CONFIGURE | grep -v '.*#.*AC_INIT' | tail -${TAIL_N}1 | sed 's/^[ ]*AC_INIT(\([^,)]*\).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`"
+ if [ "x$PROJECT" = "xAC_INIT" ] ; then
+ # projects might be using the older/deprecated arg-less AC_INIT .. look for AM_INIT_AUTOMAKE instead
+ PROJECT="`grep AM_INIT_AUTOMAKE $CONFIGURE | grep -v '.*#.*AM_INIT_AUTOMAKE' | tail -${TAIL_N}1 | sed 's/^[ ]*AM_INIT_AUTOMAKE(\([^,)]*\).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`"
+ fi
+ if [ "x$PROJECT" = "xAM_INIT_AUTOMAKE" ] ; then
+ PROJECT="project"
+ fi
+ if [ "x$PROJECT" = "x" ] ; then
+ PROJECT="project"
+ fi
+else
+ $ECHO "Using PROJECT environment variable override: $PROJECT"
+fi
+$ECHO "Preparing the $PROJECT build system...please wait"
+$ECHO
+
+
+########################
+# check for autoreconf #
+########################
+HAVE_AUTORECONF=no
+if [ "x$AUTORECONF" = "x" ] ; then
+ for AUTORECONF in autoreconf ; do
+ $VERBOSE_ECHO "Checking autoreconf version: $AUTORECONF --version"
+ $AUTORECONF --version > /dev/null 2>&1
+ if [ $? = 0 ] ; then
+ HAVE_AUTORECONF=yes
+ break
+ fi
+ done
+else
+ HAVE_AUTORECONF=yes
+ $ECHO "Using AUTORECONF environment variable override: $AUTORECONF"
+fi
+
+
+##########################
+# autoconf version check #
+##########################
+_acfound=no
+if [ "x$AUTOCONF" = "x" ] ; then
+ for AUTOCONF in autoconf ; do
+ $VERBOSE_ECHO "Checking autoconf version: $AUTOCONF --version"
+ $AUTOCONF --version > /dev/null 2>&1
+ if [ $? = 0 ] ; then
+ _acfound=yes
+ break
+ fi
+ done
+else
+ _acfound=yes
+ $ECHO "Using AUTOCONF environment variable override: $AUTOCONF"
+fi
+
+_report_error=no
+if [ ! "x$_acfound" = "xyes" ] ; then
+ $ECHO "ERROR: Unable to locate GNU Autoconf."
+ _report_error=yes
+else
+ _version="`$AUTOCONF --version | head -${HEAD_N}1 | sed 's/[^0-9]*\([0-9\.][0-9\.]*\)/\1/'`"
+ if [ "x$_version" = "x" ] ; then
+ _version="0.0.0"
+ fi
+ $ECHO "Found GNU Autoconf version $_version"
+ version_check "$AUTOCONF_VERSION" "$_version"
+ if [ $? -ne 0 ] ; then
+ _report_error=yes
+ fi
+fi
+if [ "x$_report_error" = "xyes" ] ; then
+ version_error "$AUTOCONF_VERSION" "GNU Autoconf"
+ exit 1
+fi
+
+
+##########################
+# automake version check #
+##########################
+_amfound=no
+if [ "x$AUTOMAKE" = "x" ] ; then
+ for AUTOMAKE in automake ; do
+ $VERBOSE_ECHO "Checking automake version: $AUTOMAKE --version"
+ $AUTOMAKE --version > /dev/null 2>&1
+ if [ $? = 0 ] ; then
+ _amfound=yes
+ break
+ fi
+ done
+else
+ _amfound=yes
+ $ECHO "Using AUTOMAKE environment variable override: $AUTOMAKE"
+fi
+
+
+_report_error=no
+if [ ! "x$_amfound" = "xyes" ] ; then
+ $ECHO
+ $ECHO "ERROR: Unable to locate GNU Automake."
+ _report_error=yes
+else
+ _version="`$AUTOMAKE --version | head -${HEAD_N}1 | sed 's/[^0-9]*\([0-9\.][0-9\.]*\)/\1/'`"
+ if [ "x$_version" = "x" ] ; then
+ _version="0.0.0"
+ fi
+ $ECHO "Found GNU Automake version $_version"
+ version_check "$AUTOMAKE_VERSION" "$_version"
+ if [ $? -ne 0 ] ; then
+ _report_error=yes
+ fi
+fi
+if [ "x$_report_error" = "xyes" ] ; then
+ version_error "$AUTOMAKE_VERSION" "GNU Automake"
+ exit 1
+fi
+
+
+########################
+# check for libtoolize #
+########################
+HAVE_LIBTOOLIZE=yes
+HAVE_ALT_LIBTOOLIZE=no
+_ltfound=no
+if [ "x$LIBTOOLIZE" = "x" ] ; then
+ LIBTOOLIZE=libtoolize
+ $VERBOSE_ECHO "Checking libtoolize version: $LIBTOOLIZE --version"
+ $LIBTOOLIZE --version > /dev/null 2>&1
+ if [ ! $? = 0 ] ; then
+ HAVE_LIBTOOLIZE=no
+ $ECHO
+ if [ "x$HAVE_AUTORECONF" = "xno" ] ; then
+ $ECHO "Warning: libtoolize does not appear to be available."
+ else
+ $ECHO "Warning: libtoolize does not appear to be available. This means that"
+ $ECHO "the automatic build preparation via autoreconf will probably not work."
+ $ECHO "Preparing the build by running each step individually, however, should"
+ $ECHO "work and will be done automatically for you if autoreconf fails."
+ fi
+
+ # look for some alternates
+ for tool in glibtoolize libtoolize15 libtoolize14 libtoolize13 ; do
+ $VERBOSE_ECHO "Checking libtoolize alternate: $tool --version"
+ _glibtoolize="`$tool --version > /dev/null 2>&1`"
+ if [ $? = 0 ] ; then
+ $VERBOSE_ECHO "Found $tool --version"
+ _glti="`which $tool`"
+ if [ "x$_glti" = "x" ] ; then
+ $VERBOSE_ECHO "Cannot find $tool with which"
+ continue;
+ fi
+ if test ! -f "$_glti" ; then
+ $VERBOSE_ECHO "Cannot use $tool, $_glti is not a file"
+ continue;
+ fi
+ _gltidir="`dirname $_glti`"
+ if [ "x$_gltidir" = "x" ] ; then
+ $VERBOSE_ECHO "Cannot find $tool path with dirname of $_glti"
+ continue;
+ fi
+ if test ! -d "$_gltidir" ; then
+ $VERBOSE_ECHO "Cannot use $tool, $_gltidir is not a directory"
+ continue;
+ fi
+ HAVE_ALT_LIBTOOLIZE=yes
+ LIBTOOLIZE="$tool"
+ $ECHO
+ $ECHO "Fortunately, $tool was found which means that your system may simply"
+ $ECHO "have a non-standard or incomplete GNU Autotools install. If you have"
+ $ECHO "sufficient system access, it may be possible to quell this warning by"
+ $ECHO "running:"
+ $ECHO
+ sudo -V > /dev/null 2>&1
+ if [ $? = 0 ] ; then
+ $ECHO " sudo ln -s $_glti $_gltidir/libtoolize"
+ $ECHO
+ else
+ $ECHO " ln -s $_glti $_gltidir/libtoolize"
+ $ECHO
+ $ECHO "Run that as root or with proper permissions to the $_gltidir directory"
+ $ECHO
+ fi
+ _ltfound=yes
+ break
+ fi
+ done
+ else
+ _ltfound=yes
+ fi
+else
+ _ltfound=yes
+ $ECHO "Using LIBTOOLIZE environment variable override: $LIBTOOLIZE"
+fi
+
+
+############################
+# libtoolize version check #
+############################
+_report_error=no
+if [ ! "x$_ltfound" = "xyes" ] ; then
+ $ECHO
+ $ECHO "ERROR: Unable to locate GNU Libtool."
+ _report_error=yes
+else
+ _version="`$LIBTOOLIZE --version | head -${HEAD_N}1 | sed 's/[^0-9]*\([0-9\.][0-9\.]*\)/\1/'`"
+ if [ "x$_version" = "x" ] ; then
+ _version="0.0.0"
+ fi
+ $ECHO "Found GNU Libtool version $_version"
+ version_check "$LIBTOOL_VERSION" "$_version"
+ if [ $? -ne 0 ] ; then
+ _report_error=yes
+ fi
+fi
+if [ "x$_report_error" = "xyes" ] ; then
+ version_error "$LIBTOOL_VERSION" "GNU Libtool"
+ exit 1
+fi
+
+
+#####################
+# check for aclocal #
+#####################
+if [ "x$ACLOCAL" = "x" ] ; then
+ for ACLOCAL in aclocal ; do
+ $VERBOSE_ECHO "Checking aclocal version: $ACLOCAL --version"
+ $ACLOCAL --version > /dev/null 2>&1
+ if [ $? = 0 ] ; then
+ break
+ fi
+ done
+else
+ $ECHO "Using ACLOCAL environment variable override: $ACLOCAL"
+fi
+
+
+########################
+# check for autoheader #
+########################
+if [ "x$AUTOHEADER" = "x" ] ; then
+ for AUTOHEADER in autoheader ; do
+ $VERBOSE_ECHO "Checking autoheader version: $AUTOHEADER --version"
+ $AUTOHEADER --version > /dev/null 2>&1
+ if [ $? = 0 ] ; then
+ break
+ fi
+ done
+else
+ $ECHO "Using AUTOHEADER environment variable override: $AUTOHEADER"
+fi
+
+
+#########################
+# check if version only #
+#########################
+$VERBOSE_ECHO "Checking whether to only output version information"
+if [ "x$VERSION_ONLY" = "xyes" ] ; then
+ $ECHO
+ ident
+ $ECHO "---"
+ $ECHO "Version requested. No preparation or configuration will be performed."
+ exit 0
+fi
+
+
+#################################
+# PROTECT_FROM_CLOBBER FUNCTION #
+#################################
+protect_from_clobber ( ) {
+ PFC_INIT=1
+
+ # protect COPYING & INSTALL from overwrite by automake. the
+ # automake force option will (inappropriately) ignore the existing
+ # contents of a COPYING and/or INSTALL files (depending on the
+ # version) instead of just forcing *missing* files like it does
+ # for AUTHORS, NEWS, and README. this is broken but extremely
+ # prevalent behavior, so we protect against it by keeping a backup
+ # of the file that can later be restored.
+
+ for file in COPYING INSTALL ; do
+ if test -f ${file} ; then
+ if test -f ${file}.$$.protect_from_automake.backup ; then
+ $VERBOSE_ECHO "Already backed up ${file} in `pwd`"
+ else
+ $VERBOSE_ECHO "Backing up ${file} in `pwd`"
+ $VERBOSE_ECHO "cp -p ${file} ${file}.$$.protect_from_automake.backup"
+ cp -p ${file} ${file}.$$.protect_from_automake.backup
+ fi
+ fi
+ done
+}
+
+
+##############################
+# RECURSIVE_PROTECT FUNCTION #
+##############################
+recursive_protect ( ) {
+
+ # for projects using recursive configure, run the build
+ # preparation steps for the subdirectories. this function assumes
+ # START_PATH was set to pwd before recursion begins so that
+ # relative paths work.
+
+ # git 'r done, protect COPYING and INSTALL from being clobbered
+ protect_from_clobber
+
+ if test -d autom4te.cache ; then
+ $VERBOSE_ECHO "Found an autom4te.cache directory, deleting it"
+ $VERBOSE_ECHO "rm -rf autom4te.cache"
+ rm -rf autom4te.cache
+ fi
+
+ # find configure template
+ _configure="`locate_configure_template`"
+ if [ "x$_configure" = "x" ] ; then
+ return
+ fi
+ # $VERBOSE_ECHO "Looking for configure template found `pwd`/$_configure"
+
+ # look for subdirs
+ # $VERBOSE_ECHO "Looking for subdirs in `pwd`"
+ _det_config_subdirs="`grep AC_CONFIG_SUBDIRS $_configure | grep -v '.*#.*AC_CONFIG_SUBDIRS' | sed 's/^[ ]*AC_CONFIG_SUBDIRS(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`"
+ CHECK_DIRS=""
+ for dir in $_det_config_subdirs ; do
+ if test -d "`pwd`/$dir" ; then
+ CHECK_DIRS="$CHECK_DIRS \"`pwd`/$dir\""
+ fi
+ done
+
+ # process subdirs
+ if [ ! "x$CHECK_DIRS" = "x" ] ; then
+ $VERBOSE_ECHO "Recursively scanning the following directories:"
+ $VERBOSE_ECHO " $CHECK_DIRS"
+ for dir in $CHECK_DIRS ; do
+ $VERBOSE_ECHO "Protecting files from automake in $dir"
+ cd "$START_PATH"
+ eval "cd $dir"
+
+ # recursively git 'r done
+ recursive_protect
+ done
+ fi
+} # end of recursive_protect
+
+
+#############################
+# RESTORE_CLOBBERED FUNCION #
+#############################
+restore_clobbered ( ) {
+
+ # The automake (and autoreconf by extension) -f/--force-missing
+ # option may overwrite COPYING and INSTALL even if they do exist.
+ # Here we restore the files if necessary.
+
+ spacer=no
+
+ for file in COPYING INSTALL ; do
+ if test -f ${file}.$$.protect_from_automake.backup ; then
+ if test -f ${file} ; then
+ # compare entire content, restore if needed
+ if test "x`cat ${file}`" != "x`cat ${file}.$$.protect_from_automake.backup`" ; then
+ if test "x$spacer" = "xno" ; then
+ $VERBOSE_ECHO
+ spacer=yes
+ fi
+ # restore the backup
+ $VERBOSE_ECHO "Restoring ${file} from backup (automake -f likely clobbered it)"
+ $VERBOSE_ECHO "rm -f ${file}"
+ rm -f ${file}
+ $VERBOSE_ECHO "mv ${file}.$$.protect_from_automake.backup ${file}"
+ mv ${file}.$$.protect_from_automake.backup ${file}
+ fi # check contents
+ elif test -f ${file}.$$.protect_from_automake.backup ; then
+ $VERBOSE_ECHO "mv ${file}.$$.protect_from_automake.backup ${file}"
+ mv ${file}.$$.protect_from_automake.backup ${file}
+ fi # -f ${file}
+
+ # just in case
+ $VERBOSE_ECHO "rm -f ${file}.$$.protect_from_automake.backup"
+ rm -f ${file}.$$.protect_from_automake.backup
+ fi # -f ${file}.$$.protect_from_automake.backup
+ done
+
+ CONFIGURE="`locate_configure_template`"
+ if [ "x$CONFIGURE" = "x" ] ; then
+ return
+ fi
+
+ _aux_dir="`grep AC_CONFIG_AUX_DIR $CONFIGURE | grep -v '.*#.*AC_CONFIG_AUX_DIR' | tail -${TAIL_N}1 | sed 's/^[ ]*AC_CONFIG_AUX_DIR(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`"
+ if test ! -d "$_aux_dir" ; then
+ _aux_dir=.
+ fi
+
+ for file in config.guess config.sub ltmain.sh ; do
+ if test -f "${_aux_dir}/${file}" ; then
+ $VERBOSE_ECHO "rm -f \"${_aux_dir}/${file}.backup\""
+ rm -f "${_aux_dir}/${file}.backup"
+ fi
+ done
+} # end of restore_clobbered
+
+
+##############################
+# RECURSIVE_RESTORE FUNCTION #
+##############################
+recursive_restore ( ) {
+
+ # restore COPYING and INSTALL from backup if they were clobbered
+ # for each directory recursively.
+
+ # git 'r undone
+ restore_clobbered
+
+ # find configure template
+ _configure="`locate_configure_template`"
+ if [ "x$_configure" = "x" ] ; then
+ return
+ fi
+
+ # look for subdirs
+ _det_config_subdirs="`grep AC_CONFIG_SUBDIRS $_configure | grep -v '.*#.*AC_CONFIG_SUBDIRS' | sed 's/^[ ]*AC_CONFIG_SUBDIRS(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`"
+ CHECK_DIRS=""
+ for dir in $_det_config_subdirs ; do
+ if test -d "`pwd`/$dir" ; then
+ CHECK_DIRS="$CHECK_DIRS \"`pwd`/$dir\""
+ fi
+ done
+
+ # process subdirs
+ if [ ! "x$CHECK_DIRS" = "x" ] ; then
+ $VERBOSE_ECHO "Recursively scanning the following directories:"
+ $VERBOSE_ECHO " $CHECK_DIRS"
+ for dir in $CHECK_DIRS ; do
+ $VERBOSE_ECHO "Checking files for automake damage in $dir"
+ cd "$START_PATH"
+ eval "cd $dir"
+
+ # recursively git 'r undone
+ recursive_restore
+ done
+ fi
+} # end of recursive_restore
+
+
+#######################
+# INITIALIZE FUNCTION #
+#######################
+initialize ( ) {
+
+ # this routine performs a variety of directory-specific
+ # initializations. some are sanity checks, some are preventive,
+ # and some are necessary setup detection.
+ #
+ # this function sets:
+ # CONFIGURE
+ # SEARCH_DIRS
+ # CONFIG_SUBDIRS
+
+ ##################################
+ # check for a configure template #
+ ##################################
+ CONFIGURE="`locate_configure_template`"
+ if [ "x$CONFIGURE" = "x" ] ; then
+ $ECHO
+ $ECHO "A configure.ac or configure.in file could not be located implying"
+ $ECHO "that the GNU Build System is at least not used in this directory. In"
+ $ECHO "any case, there is nothing to do here without one of those files."
+ $ECHO
+ $ECHO "ERROR: No configure.in or configure.ac file found in `pwd`"
+ exit 1
+ fi
+
+ #####################
+ # detect an aux dir #
+ #####################
+ _aux_dir="`grep AC_CONFIG_AUX_DIR $CONFIGURE | grep -v '.*#.*AC_CONFIG_AUX_DIR' | tail -${TAIL_N}1 | sed 's/^[ ]*AC_CONFIG_AUX_DIR(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`"
+ if test ! -d "$_aux_dir" ; then
+ _aux_dir=.
+ else
+ $VERBOSE_ECHO "Detected auxillary directory: $_aux_dir"
+ fi
+
+ ################################
+ # detect a recursive configure #
+ ################################
+ CONFIG_SUBDIRS=""
+ _det_config_subdirs="`grep AC_CONFIG_SUBDIRS $CONFIGURE | grep -v '.*#.*AC_CONFIG_SUBDIRS' | sed 's/^[ ]*AC_CONFIG_SUBDIRS(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`"
+ for dir in $_det_config_subdirs ; do
+ if test -d "`pwd`/$dir" ; then
+ $VERBOSE_ECHO "Detected recursive configure directory: `pwd`/$dir"
+ CONFIG_SUBDIRS="$CONFIG_SUBDIRS `pwd`/$dir"
+ fi
+ done
+
+ ##########################################
+ # make sure certain required files exist #
+ ##########################################
+ for file in AUTHORS COPYING ChangeLog INSTALL NEWS README ; do
+ if test ! -f $file ; then
+ $VERBOSE_ECHO "Touching ${file} since it does not exist"
+ touch $file
+ fi
+ done
+
+ ##################################################
+ # make sure certain generated files do not exist #
+ ##################################################
+ for file in config.guess config.sub ltmain.sh ; do
+ if test -f "${_aux_dir}/${file}" ; then
+ $VERBOSE_ECHO "mv -f \"${_aux_dir}/${file}\" \"${_aux_dir}/${file}.backup\""
+ mv -f "${_aux_dir}/${file}" "${_aux_dir}/${file}.backup"
+ fi
+ done
+
+ ############################
+ # search alternate m4 dirs #
+ ############################
+ SEARCH_DIRS=""
+ for dir in m4 ; do
+ if [ -d $dir ] ; then
+ $VERBOSE_ECHO "Found extra aclocal search directory: $dir"
+ SEARCH_DIRS="$SEARCH_DIRS -I $dir"
+ fi
+ done
+
+ ######################################
+ # remove any previous build products #
+ ######################################
+ if test -d autom4te.cache ; then
+ $VERBOSE_ECHO "Found an autom4te.cache directory, deleting it"
+ $VERBOSE_ECHO "rm -rf autom4te.cache"
+ rm -rf autom4te.cache
+ fi
+# tcl/tk (and probably others) have a customized aclocal.m4, so can't delete it
+# if test -f aclocal.m4 ; then
+# $VERBOSE_ECHO "Found an aclocal.m4 file, deleting it"
+# $VERBOSE_ECHO "rm -f aclocal.m4"
+# rm -f aclocal.m4
+# fi
+
+} # end of initialize()
+
+
+##############
+# initialize #
+##############
+
+# stash path
+START_PATH="`pwd`"
+
+# Before running autoreconf or manual steps, some prep detection work
+# is necessary or useful. Only needs to occur once per directory, but
+# does need to traverse the entire subconfigure hierarchy to protect
+# files from being clobbered even by autoreconf.
+recursive_protect
+
+# start from where we started
+cd "$START_PATH"
+
+# get ready to process
+initialize
+
+
+#########################################
+# DOWNLOAD_GNULIB_CONFIG_GUESS FUNCTION #
+#########################################
+
+download_gnulib_config_guess () {
+ # abuse gitweb to download gnulib's latest config.guess via HTTP
+ config_guess_url='http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;f=build-aux/config.guess;hb=HEAD'
+ config_guess_temp=`mktemp`
+ ret=1
+ for __cmd in wget curl fetch ; do
+ $VERBOSE_ECHO "Checking for command ${__cmd}"
+ ${__cmd} --version &>/dev/null
+ ret=$?
+ if [ ! $ret = 0 ] ; then
+ continue
+ fi
+
+ __cmd_version=`${__cmd} --version | head -n 1 | sed -e 's/^[^0-9]\+//' -e 's/ .*//'`
+ $VERBOSE_ECHO "Found ${__cmd} ${__cmd_version}"
+
+ $VERBOSE_ECHO "Downloading gnulib's latest config.guess"
+ case ${__cmd} in
+ wget)
+ wget "${config_guess_url}" -O "${config_guess_temp}" &>/dev/null
+ ret=$?
+ ;;
+ curl)
+ curl "${config_guess_url}" -o "${config_guess_temp}" &>/dev/null
+ ret=$?
+ ;;
+ fetch)
+ fetch "${config_guess_url}" -t 5 -f "${config_guess_temp}" &>/dev/null
+ ret=$?
+ ;;
+ esac
+
+ if [ $ret = 0 ] ; then
+ mv -f "${config_guess_temp}" ${_aux_dir}/config.guess
+ break
+ fi
+ done
+
+ if [ ! $ret = 0 ] ; then
+ $ECHO "Warning: config.guess download failed"
+ rm -f "${config_guess_temp}"
+ fi
+}
+
+
+##############################
+# LIBTOOLIZE_NEEDED FUNCTION #
+##############################
+libtoolize_needed () {
+ ret=1 # means no
+ for feature in AC_PROG_LIBTOOL LT_INIT ; do
+ $VERBOSE_ECHO "Searching for $feature in $CONFIGURE"
+ found="`grep \"^$feature.*\" $CONFIGURE`"
+ if [ ! "x$found" = "x" ] ; then
+ ret=0 # means yes
+ break
+ fi
+ done
+ return ${ret}
+}
+
+
+
+############################################
+# prepare build via autoreconf or manually #
+############################################
+reconfigure_manually=no
+if [ "x$HAVE_AUTORECONF" = "xyes" ] ; then
+ $ECHO
+ $ECHO $ECHO_N "Automatically preparing build ... $ECHO_C"
+
+ $VERBOSE_ECHO "$AUTORECONF $SEARCH_DIRS $AUTORECONF_OPTIONS"
+ autoreconf_output="`$AUTORECONF $SEARCH_DIRS $AUTORECONF_OPTIONS 2>&1`"
+ ret=$?
+ $VERBOSE_ECHO "$autoreconf_output"
+
+ if [ ! $ret = 0 ] ; then
+ if [ "x$HAVE_ALT_LIBTOOLIZE" = "xyes" ] ; then
+ if [ ! "x`echo \"$autoreconf_output\" | grep libtoolize | grep \"No such file or directory\"`" = "x" ] ; then
+ $ECHO
+ $ECHO "Warning: autoreconf failed but due to what is usually a common libtool"
+ $ECHO "misconfiguration issue. This problem is encountered on systems that"
+ $ECHO "have installed libtoolize under a different name without providing a"
+ $ECHO "symbolic link or without setting the LIBTOOLIZE environment variable."
+ $ECHO
+ $ECHO "Restarting the preparation steps with LIBTOOLIZE set to $LIBTOOLIZE"
+
+ export LIBTOOLIZE
+ RUN_RECURSIVE=no
+ export RUN_RECURSIVE
+ untrap_abnormal
+
+ $VERBOSE_ECHO sh $AUTOGEN_SH "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9"
+ sh "$AUTOGEN_SH" "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9"
+ exit $?
+ fi
+ fi
+
+ $ECHO "Warning: $AUTORECONF failed"
+
+ if test -f ltmain.sh ; then
+ $ECHO "libtoolize being run by autoreconf is not creating ltmain.sh in the auxillary directory like it should"
+ fi
+
+ $ECHO "Attempting to run the preparation steps individually"
+ reconfigure_manually=yes
+ else
+ if libtoolize_needed ; then
+ download_gnulib_config_guess
+ fi
+ fi
+else
+ reconfigure_manually=yes
+fi
+
+
+############################
+# LIBTOOL_FAILURE FUNCTION #
+############################
+libtool_failure ( ) {
+
+ # libtool is rather error-prone in comparison to the other
+ # autotools and this routine attempts to compensate for some
+ # common failures. the output after a libtoolize failure is
+ # parsed for an error related to AC_PROG_LIBTOOL and if found, we
+ # attempt to inject a project-provided libtool.m4 file.
+
+ _autoconf_output="$1"
+
+ if [ "x$RUN_RECURSIVE" = "xno" ] ; then
+ # we already tried the libtool.m4, don't try again
+ return 1
+ fi
+
+ if test -f "$LIBTOOL_M4" ; then
+ found_libtool="`$ECHO $_autoconf_output | grep AC_PROG_LIBTOOL`"
+ if test ! "x$found_libtool" = "x" ; then
+ if test -f acinclude.m4 ; then
+ rm -f acinclude.m4.$$.backup
+ $VERBOSE_ECHO "cat acinclude.m4 > acinclude.m4.$$.backup"
+ cat acinclude.m4 > acinclude.m4.$$.backup
+ fi
+ $VERBOSE_ECHO "cat \"$LIBTOOL_M4\" >> acinclude.m4"
+ chmod u+w acinclude.m4
+ cat "$LIBTOOL_M4" >> acinclude.m4
+
+ # don't keep doing this
+ RUN_RECURSIVE=no
+ export RUN_RECURSIVE
+ untrap_abnormal
+
+ $ECHO
+ $ECHO "Restarting the preparation steps with libtool macros in acinclude.m4"
+ $VERBOSE_ECHO sh $AUTOGEN_SH "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9"
+ sh "$AUTOGEN_SH" "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9"
+ exit $?
+ fi
+ fi
+}
+
+
+###########################
+# MANUAL_AUTOGEN FUNCTION #
+###########################
+manual_autogen ( ) {
+
+ ##################################################
+ # Manual preparation steps taken are as follows: #
+ # aclocal [-I m4] #
+ # libtoolize --automake -c -f #
+ # aclocal [-I m4] #
+ # autoconf -f #
+ # autoheader #
+ # automake -a -c -f #
+ ##################################################
+
+ ###########
+ # aclocal #
+ ###########
+ $VERBOSE_ECHO "$ACLOCAL $SEARCH_DIRS $ACLOCAL_OPTIONS"
+ aclocal_output="`$ACLOCAL $SEARCH_DIRS $ACLOCAL_OPTIONS 2>&1`"
+ ret=$?
+ $VERBOSE_ECHO "$aclocal_output"
+ if [ ! $ret = 0 ] ; then $ECHO "ERROR: $ACLOCAL failed" && exit 2 ; fi
+
+ ##############
+ # libtoolize #
+ ##############
+ if libtoolize_needed ; then
+ if [ "x$HAVE_LIBTOOLIZE" = "xyes" ] ; then
+ $VERBOSE_ECHO "$LIBTOOLIZE $LIBTOOLIZE_OPTIONS"
+ libtoolize_output="`$LIBTOOLIZE $LIBTOOLIZE_OPTIONS 2>&1`"
+ ret=$?
+ $VERBOSE_ECHO "$libtoolize_output"
+
+ if [ ! $ret = 0 ] ; then $ECHO "ERROR: $LIBTOOLIZE failed" && exit 2 ; fi
+ else
+ if [ "x$HAVE_ALT_LIBTOOLIZE" = "xyes" ] ; then
+ $VERBOSE_ECHO "$LIBTOOLIZE $ALT_LIBTOOLIZE_OPTIONS"
+ libtoolize_output="`$LIBTOOLIZE $ALT_LIBTOOLIZE_OPTIONS 2>&1`"
+ ret=$?
+ $VERBOSE_ECHO "$libtoolize_output"
+
+ if [ ! $ret = 0 ] ; then $ECHO "ERROR: $LIBTOOLIZE failed" && exit 2 ; fi
+ fi
+ fi
+
+ ###########
+ # aclocal #
+ ###########
+ # re-run again as instructed by libtoolize
+ $VERBOSE_ECHO "$ACLOCAL $SEARCH_DIRS $ACLOCAL_OPTIONS"
+ aclocal_output="`$ACLOCAL $SEARCH_DIRS $ACLOCAL_OPTIONS 2>&1`"
+ ret=$?
+ $VERBOSE_ECHO "$aclocal_output"
+
+ # libtoolize might put ltmain.sh in the wrong place
+ if test -f ltmain.sh ; then
+ if test ! -f "${_aux_dir}/ltmain.sh" ; then
+ $ECHO
+ $ECHO "Warning: $LIBTOOLIZE is creating ltmain.sh in the wrong directory"
+ $ECHO
+ $ECHO "Fortunately, the problem can be worked around by simply copying the"
+ $ECHO "file to the appropriate location (${_aux_dir}/). This has been done for you."
+ $ECHO
+ $VERBOSE_ECHO "cp -p ltmain.sh \"${_aux_dir}/ltmain.sh\""
+ cp -p ltmain.sh "${_aux_dir}/ltmain.sh"
+ $ECHO $ECHO_N "Continuing build preparation ... $ECHO_C"
+ fi
+ fi # ltmain.sh
+
+ download_gnulib_config_guess
+ fi # libtoolize_needed
+
+ ############
+ # autoconf #
+ ############
+ $VERBOSE_ECHO
+ $VERBOSE_ECHO "$AUTOCONF $AUTOCONF_OPTIONS"
+ autoconf_output="`$AUTOCONF $AUTOCONF_OPTIONS 2>&1`"
+ ret=$?
+ $VERBOSE_ECHO "$autoconf_output"
+
+ if [ ! $ret = 0 ] ; then
+ # retry without the -f and check for usage of macros that are too new
+ ac2_59_macros="AC_C_RESTRICT AC_INCLUDES_DEFAULT AC_LANG_ASSERT AC_LANG_WERROR AS_SET_CATFILE"
+ ac2_55_macros="AC_COMPILER_IFELSE AC_FUNC_MBRTOWC AC_HEADER_STDBOOL AC_LANG_CONFTEST AC_LANG_SOURCE AC_LANG_PROGRAM AC_LANG_CALL AC_LANG_FUNC_TRY_LINK AC_MSG_FAILURE AC_PREPROC_IFELSE"
+ ac2_54_macros="AC_C_BACKSLASH_A AC_CONFIG_LIBOBJ_DIR AC_GNU_SOURCE AC_PROG_EGREP AC_PROG_FGREP AC_REPLACE_FNMATCH AC_FUNC_FNMATCH_GNU AC_FUNC_REALLOC AC_TYPE_MBSTATE_T"
+
+ macros_to_search=""
+ ac_major="`echo ${AUTOCONF_VERSION}. | cut -d. -f1 | sed 's/[^0-9]//g'`"
+ ac_minor="`echo ${AUTOCONF_VERSION}. | cut -d. -f2 | sed 's/[^0-9]//g'`"
+
+ if [ $ac_major -lt 2 ] ; then
+ macros_to_search="$ac2_59_macros $ac2_55_macros $ac2_54_macros"
+ else
+ if [ $ac_minor -lt 54 ] ; then
+ macros_to_search="$ac2_59_macros $ac2_55_macros $ac2_54_macros"
+ elif [ $ac_minor -lt 55 ] ; then
+ macros_to_search="$ac2_59_macros $ac2_55_macros"
+ elif [ $ac_minor -lt 59 ] ; then
+ macros_to_search="$ac2_59_macros"
+ fi
+ fi
+
+ configure_ac_macros=__none__
+ for feature in $macros_to_search ; do
+ $VERBOSE_ECHO "Searching for $feature in $CONFIGURE"
+ found="`grep \"^$feature.*\" $CONFIGURE`"
+ if [ ! "x$found" = "x" ] ; then
+ if [ "x$configure_ac_macros" = "x__none__" ] ; then
+ configure_ac_macros="$feature"
+ else
+ configure_ac_macros="$feature $configure_ac_macros"
+ fi
+ fi
+ done
+ if [ ! "x$configure_ac_macros" = "x__none__" ] ; then
+ $ECHO
+ $ECHO "Warning: Unsupported macros were found in $CONFIGURE"
+ $ECHO
+ $ECHO "The `echo $CONFIGURE | basename` file was scanned in order to determine if any"
+ $ECHO "unsupported macros are used that exceed the minimum version"
+ $ECHO "settings specified within this file. As such, the following macros"
+ $ECHO "should be removed from configure.ac or the version numbers in this"
+ $ECHO "file should be increased:"
+ $ECHO
+ $ECHO "$configure_ac_macros"
+ $ECHO
+ $ECHO $ECHO_N "Ignorantly continuing build preparation ... $ECHO_C"
+ fi
+
+ ###################
+ # autoconf, retry #
+ ###################
+ $VERBOSE_ECHO
+ $VERBOSE_ECHO "$AUTOCONF"
+ autoconf_output="`$AUTOCONF 2>&1`"
+ ret=$?
+ $VERBOSE_ECHO "$autoconf_output"
+
+ if [ ! $ret = 0 ] ; then
+ # test if libtool is busted
+ libtool_failure "$autoconf_output"
+
+ # let the user know what went wrong
+ cat <<EOF
+$autoconf_output
+EOF
+ $ECHO "ERROR: $AUTOCONF failed"
+ exit 2
+ else
+ # autoconf sans -f and possibly sans unsupported options succeed so warn verbosely
+ $ECHO
+ $ECHO "Warning: autoconf seems to have succeeded by removing the following options:"
+ $ECHO " AUTOCONF_OPTIONS=\"$AUTOCONF_OPTIONS\""
+ $ECHO
+ $ECHO "Removing those options should not be necessary and indicate some other"
+ $ECHO "problem with the build system. The build preparation is highly suspect"
+ $ECHO "and may result in configuration or compilation errors. Consider"
+ if [ "x$VERBOSE_ECHO" = "x:" ] ; then
+ $ECHO "rerunning the build preparation with verbose output enabled."
+ $ECHO " $AUTOGEN_SH --verbose"
+ else
+ $ECHO "reviewing the minimum GNU Autotools version settings contained in"
+ $ECHO "this script along with the macros being used in your `echo $CONFIGURE | basename` file."
+ fi
+ $ECHO
+ $ECHO $ECHO_N "Continuing build preparation ... $ECHO_C"
+ fi # autoconf ret = 0
+ fi # autoconf ret = 0
+
+ ##############
+ # autoheader #
+ ##############
+ need_autoheader=no
+ for feature in AM_CONFIG_HEADER AC_CONFIG_HEADER ; do
+ $VERBOSE_ECHO "Searching for $feature in $CONFIGURE"
+ found="`grep \"^$feature.*\" $CONFIGURE`"
+ if [ ! "x$found" = "x" ] ; then
+ need_autoheader=yes
+ break
+ fi
+ done
+ if [ "x$need_autoheader" = "xyes" ] ; then
+ $VERBOSE_ECHO "$AUTOHEADER $AUTOHEADER_OPTIONS"
+ autoheader_output="`$AUTOHEADER $AUTOHEADER_OPTIONS 2>&1`"
+ ret=$?
+ $VERBOSE_ECHO "$autoheader_output"
+ if [ ! $ret = 0 ] ; then $ECHO "ERROR: $AUTOHEADER failed" && exit 2 ; fi
+ fi # need_autoheader
+
+ ############
+ # automake #
+ ############
+ need_automake=no
+ for feature in AM_INIT_AUTOMAKE ; do
+ $VERBOSE_ECHO "Searching for $feature in $CONFIGURE"
+ found="`grep \"^$feature.*\" $CONFIGURE`"
+ if [ ! "x$found" = "x" ] ; then
+ need_automake=yes
+ break
+ fi
+ done
+
+ if [ "x$need_automake" = "xyes" ] ; then
+ $VERBOSE_ECHO "$AUTOMAKE $AUTOMAKE_OPTIONS"
+ automake_output="`$AUTOMAKE $AUTOMAKE_OPTIONS 2>&1`"
+ ret=$?
+ $VERBOSE_ECHO "$automake_output"
+
+ if [ ! $ret = 0 ] ; then
+
+ ###################
+ # automake, retry #
+ ###################
+ $VERBOSE_ECHO
+ $VERBOSE_ECHO "$AUTOMAKE $ALT_AUTOMAKE_OPTIONS"
+ # retry without the -f
+ automake_output="`$AUTOMAKE $ALT_AUTOMAKE_OPTIONS 2>&1`"
+ ret=$?
+ $VERBOSE_ECHO "$automake_output"
+
+ if [ ! $ret = 0 ] ; then
+ # test if libtool is busted
+ libtool_failure "$automake_output"
+
+ # let the user know what went wrong
+ cat <<EOF
+$automake_output
+EOF
+ $ECHO "ERROR: $AUTOMAKE failed"
+ exit 2
+ fi # automake retry
+ fi # automake ret = 0
+ fi # need_automake
+} # end of manual_autogen
+
+
+#####################################
+# RECURSIVE_MANUAL_AUTOGEN FUNCTION #
+#####################################
+recursive_manual_autogen ( ) {
+
+ # run the build preparation steps manually for this directory
+ manual_autogen
+
+ # for projects using recursive configure, run the build
+ # preparation steps for the subdirectories.
+ if [ ! "x$CONFIG_SUBDIRS" = "x" ] ; then
+ $VERBOSE_ECHO "Recursively configuring the following directories:"
+ $VERBOSE_ECHO " $CONFIG_SUBDIRS"
+ for dir in $CONFIG_SUBDIRS ; do
+ $VERBOSE_ECHO "Processing recursive configure in $dir"
+ cd "$START_PATH"
+ cd "$dir"
+
+ # new directory, prepare
+ initialize
+
+ # run manual steps for the subdir and any others below
+ recursive_manual_autogen
+ done
+ fi
+}
+
+
+################################
+# run manual preparation steps #
+################################
+if [ "x$reconfigure_manually" = "xyes" ] ; then
+ $ECHO
+ $ECHO $ECHO_N "Preparing build ... $ECHO_C"
+
+ recursive_manual_autogen
+fi
+
+
+#########################
+# restore and summarize #
+#########################
+cd "$START_PATH"
+
+# restore COPYING and INSTALL from backup if necessary
+recursive_restore
+
+# make sure we end up with a configure script
+config_ac="`locate_configure_template`"
+config="`echo $config_ac | sed 's/\.ac$//' | sed 's/\.in$//'`"
+if [ "x$config" = "x" ] ; then
+ $VERBOSE_ECHO "Could not locate the configure template (from `pwd`)"
+fi
+
+# summarize
+$ECHO "done"
+$ECHO
+if test "x$config" = "x" -o ! -f "$config" ; then
+ $ECHO "WARNING: The $PROJECT build system should now be prepared but there"
+ $ECHO "does not seem to be a resulting configure file. This is unexpected"
+ $ECHO "and likely the result of an error. You should run $NAME_OF_AUTOGEN"
+ $ECHO "with the --verbose option to get more details on a potential"
+ $ECHO "misconfiguration."
+else
+ $ECHO "The $PROJECT build system is now prepared. To build here, run:"
+ $ECHO " $config"
+ $ECHO " make"
+fi
+
+
+# Local Variables:
+# mode: sh
+# tab-width: 8
+# sh-basic-offset: 4
+# sh-indentation: 4
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=4 tabstop=8
Property changes on: trunk/autogen.sh
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:eol-style
+ native
Property changes on: trunk/bindings/c/doc
___________________________________________________________________
Modified: svn:ignore
- autom4te.cache
html
aclocal.m4
confcache
config.log
config.status
configure
hhc.exe
install-sh
Makefile
Makefile.in
missing
*.chm
*.zip
+ autom4te.cache
html
aclocal.m4
confcache
config.log
config.status
configure
*.exe
Makefile
Makefile.in
*.chm
*.qch
*.zip
Deleted: trunk/bindings/c/doc/Doxyfile
===================================================================
--- trunk/bindings/c/doc/Doxyfile 2008-11-20 14:27:50 UTC (rev 508)
+++ trunk/bindings/c/doc/Doxyfile 2008-12-03 21:56:50 UTC (rev 509)
@@ -1,923 +0,0 @@
-# spiff_c Doxyfile for Doxygen 1.4.7
-
-
-
-
-###############################################################
-# Project related options
-###############################################################
-
-
-PROJECT_NAME = spiff_c
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by double-quotes) that should identify the project for which the documentation is generated. This name is used in the title of most generated pages and in a few other places.
-
-
-PROJECT_NUMBER = "1.0.0"
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. This could be handy for archiving the generated documentation or if some version control system is used.
-
-
-CHM_FILE = "..\spiff_c-1.0.0-doc.chm"
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can be used to specify the file name of the resulting .chm file. You can add a path in front of the file if the result should not be written to the html output directory.
-
-
-OUTPUT_DIRECTORY = .
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path into which the generated documentation will be written. If a relative path is entered, it will be relative to the location where doxygen was started. If left blank the current directory will be used.
-
-
-# CREATE_SUBDIRS =
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-directories (in 2 levels) under the output directory of each output format and will distribute the generated files over these directories. Enabling this option can be useful when feeding doxygen a huge amount of source files, where putting all generated files in the same directory would otherwise causes performance problems for the file system.
-
-
-# OUTPUT_LANGUAGE =
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all documentation generated by doxygen is written. Doxygen will use this information to generate all constant output in the proper language. The default language is English, other supported languages are: Afrikaans, Arabic, Brazilian, Catalan, Chinese, Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hungarian, Italian, Japanese, Korean, Lithuanian, Norwegian, Persian, Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian.
-
-
-# USE_WINDOWS_ENCODING =
-# This tag can be used to specify the encoding used in the generated output. The encoding is not always determined by the language that is chosen, but also whether or not the output is meant for Windows or non-Windows users. In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES forces the Windows encoding, (this is the default for the Windows binary), whereas setting the tag to NO uses a Unix-style encoding (the default for all platforms other than Windows).
-
-
-# BRIEF_MEMBER_DESC =
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) doxygen will include brief member descriptions after the members that are listed in the file and class documentation (similar to JavaDoc). Set to NO to disable this.
-
-
-# REPEAT_BRIEF =
-# If the REPEAT_BRIEF tag is set to YES (the default) doxygen will prepend the brief description of a member or function before the detailed description
-#
-# Note:
-# If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the brief descriptions will be completely suppressed.
-
-
-# ABBREVIATE_BRIEF =
-# This tag implements a quasi-intelligent brief description abbreviator that is used to form the text in various listings. Each string in this list, if found as the leading text of the brief description, will be stripped from the text and the result after processing the whole list, is used as the annotated text. Otherwise, the brief description is used as-is. If left blank, the following values are used ("\$name" is automatically replaced with the name of the entity): "The $name class" "The $name widget" "The $name file" "is" "provides" "specifies" "contains" "represents" "a" "an" "the".
-
-
-# ALWAYS_DETAILED_SEC =
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then doxygen will generate a detailed section even if there is only a brief description.
-
-
-# INLINE_INHERITED_MEMB =
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited members of a class in the documentation of that class as if those members were ordinary class members. Constructors, destructors and assignment operators of the base classes will not be shown.
-
-
-FULL_PATH_NAMES = NO
-# If the FULL_PATH_NAMES tag is set to YES doxygen will prepend the full path before files name in the file list and in the header files. If set to NO the shortest path that makes the file name unique will be used
-
-
-# STRIP_FROM_PATH =
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag can be used to strip a user-defined part of the path. Stripping is only done if one of the specified strings matches the left-hand part of the path. The tag can be used to show relative paths in the file list. If left blank the directory from which doxygen is run is used as the path to strip.
-
-
-# STRIP_FROM_INC_PATH =
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the path mentioned in the documentation of a class, which tells the reader which header file to include in order to use a class. If left blank only the name of the header file containing the class definition is used. Otherwise one should specify the include paths that are normally passed to the compiler using the -I flag.
-
-
-# CASE_SENSE_NAMES =
-# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file names in lower-case letters. If set to YES upper-case letters are also allowed. This is useful if you have classes or files whose names only differ in case and if your file system supports case sensitive file names. Windows users are advised to set this option to NO.
-
-
-# SHORT_NAMES =
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but less readable) file names. This can be useful is your file systems doesn't support long names like on DOS, Mac, or CD-ROM.
-
-
-# JAVADOC_AUTOBRIEF =
-# If the JAVADOC_AUTOBRIEF is set to YES then doxygen will interpret the first line (until the first dot) of a JavaDoc-style comment as the brief description. If set to NO (the default), the Javadoc-style will behave just like the Qt-style comments.
-
-
-BUILTIN_STL_SUPPORT = NO
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to include (a tag file for) the STL sources as input, then you should set this tag to YES in order to let doxygen match functions declarations and definitions whose arguments contain STL classes (e.g. func(std::string); v.s. func(std::string) {}). This also make the inheritance and collaboration diagrams that involve STL classes more complete and accurate.
-
-
-# DISTRIBUTE_GROUP_DOC =
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC tag is set to YES, then doxygen will reuse the documentation of the first member in the group (if any) for the other members of the group. By default all members of a group must be documented explicitly.
-
-
-# MULTILINE_CPP_IS_BRIEF =
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen treat a multi-line C++ special comment block (i.e. a block of //! or /// comments) as a brief description. This used to be the default behaviour. The new default is to treat a multi-line C++ comment block as a detailed description. Set this tag to YES if you prefer the old behaviour instead. Note that setting this tag to YES also means that rational rose comments are not recognized any more.
-
-
-DETAILS_AT_TOP = YES
-# If the DETAILS_AT_TOP tag is set to YES then Doxygen will output the detailed description near the top, like JavaDoc. If set to NO, the detailed description appears after the member documentation.
-
-
-# INHERIT_DOCS =
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented member inherits the documentation from any documented member that it re-implements.
-
-
-# SEPARATE_MEMBER_PAGES =
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce a new page for each member. If set to NO, the documentation of a member will be part of the file/class/namespace that contains it.
-
-
-# TAB_SIZE =
-# the TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen uses this value to replace tabs by spaces in code fragments.
-
-
-# ALIASES =
-# This tag can be used to specify a number of aliases that acts as commands in the documentation. An alias has the form
-#
-# name=value
-#
-# For example adding
-#
-# "sideeffect=\par Side Effects:\n"
-#
-# will allow you to put the command \sideeffect (or @sideeffect) in the documentation, which will result in a user-defined paragraph with heading "Side Effects:". You can put \n's in the value part of an alias to insert newlines.
-
-
-OPTIMIZE_OUTPUT_FOR_C = NO
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources only. Doxygen will then generate output that is more tailored for C. For instance, some of the names that are used will be different. The list of all members will be omitted, etc.
-
-
-# OPTIMIZE_OUTPUT_JAVA =
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or Python sources only. Doxygen will then generate output that is more tailored for that language. For instance, ...
[truncated message content] |
|
From: <har...@us...> - 2008-11-20 14:27:55
|
Revision: 508
http://libspiff.svn.sourceforge.net/libspiff/?rev=508&view=rev
Author: hartwork
Date: 2008-11-20 14:27:50 +0000 (Thu, 20 Nov 2008)
Log Message:
-----------
Fix GCC 4.4 compile errors
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/SpiffPropsWriter.cpp
trunk/src/SpiffWriter.cpp
trunk/src/SpiffXmlFormatter.cpp
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-11-19 23:17:09 UTC (rev 507)
+++ trunk/ChangeLog 2008-11-20 14:27:50 UTC (rev 508)
@@ -1,5 +1,7 @@
???
+ * Fixed: Compile errors with GCC 4.4
+ Thanks to Martin Michlmayr for the patch!
* Fixed: Compile errors with Sun Ceres C++ 5.10
Thanks to Tim Mooney for the patch!
Also, http://predef.sf.net/ was helpful again.
Modified: trunk/src/SpiffPropsWriter.cpp
===================================================================
--- trunk/src/SpiffPropsWriter.cpp 2008-11-19 23:17:09 UTC (rev 507)
+++ trunk/src/SpiffPropsWriter.cpp 2008-11-20 14:27:50 UTC (rev 508)
@@ -51,6 +51,7 @@
#include <spiff/SpiffExtensionWriter.h>
#include <spiff/SpiffToolbox.h>
#include <list>
+#include <cstdio>
#include <cstdlib>
namespace Spiff {
Modified: trunk/src/SpiffWriter.cpp
===================================================================
--- trunk/src/SpiffWriter.cpp 2008-11-19 23:17:09 UTC (rev 507)
+++ trunk/src/SpiffWriter.cpp 2008-11-20 14:27:50 UTC (rev 508)
@@ -49,6 +49,7 @@
#include <spiff/SpiffXmlFormatter.h>
#include <spiff/SpiffProps.h>
#include <spiff/SpiffToolbox.h>
+#include <cstdio>
#include <string>
namespace Spiff {
Modified: trunk/src/SpiffXmlFormatter.cpp
===================================================================
--- trunk/src/SpiffXmlFormatter.cpp 2008-11-19 23:17:09 UTC (rev 507)
+++ trunk/src/SpiffXmlFormatter.cpp 2008-11-20 14:27:50 UTC (rev 508)
@@ -48,6 +48,7 @@
#include <map>
#include <list>
#include <set>
+#include <cstdio>
namespace Spiff {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <har...@us...> - 2008-11-19 23:17:15
|
Revision: 507
http://libspiff.svn.sourceforge.net/libspiff/?rev=507&view=rev
Author: hartwork
Date: 2008-11-19 23:17:09 +0000 (Wed, 19 Nov 2008)
Log Message:
-----------
svn:ignore stuff
Property Changed:
----------------
trunk/src/ZirkorosOnline/
trunk/test/ZirkorosOnline/
Property changes on: trunk/src/ZirkorosOnline
___________________________________________________________________
Added: svn:ignore
+ .dirstamp
.deps
Property changes on: trunk/test/ZirkorosOnline
___________________________________________________________________
Added: svn:ignore
+ .deps
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <har...@us...> - 2008-11-17 20:02:25
|
Revision: 506
http://libspiff.svn.sourceforge.net/libspiff/?rev=506&view=rev
Author: hartwork
Date: 2008-11-17 20:02:19 +0000 (Mon, 17 Nov 2008)
Log Message:
-----------
Apply Sun compiler patch by Tim Mooney
Modified Paths:
--------------
trunk/ChangeLog
trunk/THANKS
trunk/TODO.txt
trunk/src/SpiffDateTime.cpp
trunk/src/SpiffReader.cpp
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-11-16 23:06:25 UTC (rev 505)
+++ trunk/ChangeLog 2008-11-17 20:02:19 UTC (rev 506)
@@ -1,5 +1,8 @@
???
+ * Fixed: Compile errors with Sun Ceres C++ 5.10
+ Thanks to Tim Mooney for the patch!
+ Also, http://predef.sf.net/ was helpful again.
* Fixed: Test suite compile fix for GCC 4.3
Thanks to Alexis Ballier for the patch!
* Changed: Build system changes:
Modified: trunk/THANKS
===================================================================
--- trunk/THANKS 2008-11-16 23:06:25 UTC (rev 505)
+++ trunk/THANKS 2008-11-17 20:02:19 UTC (rev 506)
@@ -16,4 +16,5 @@
Robert Buchholz
Samuli Suominen
Szabolcs Horv\xE1t
+Tim Mooney
Vitaly Lipatov
Modified: trunk/TODO.txt
===================================================================
--- trunk/TODO.txt 2008-11-16 23:06:25 UTC (rev 505)
+++ trunk/TODO.txt 2008-11-17 20:02:19 UTC (rev 506)
@@ -6,4 +6,3 @@
* input output parameter tags
* update boostrap scripts to state of uriparser
* nested configure as with uriparser?
- * build-aux dir as with uriparser?
Modified: trunk/src/SpiffDateTime.cpp
===================================================================
--- trunk/src/SpiffDateTime.cpp 2008-11-16 23:06:25 UTC (rev 505)
+++ trunk/src/SpiffDateTime.cpp 2008-11-17 20:02:19 UTC (rev 506)
@@ -46,7 +46,11 @@
#include <spiff/SpiffDateTime.h>
#include <cstring>
+#if defined(sun) || defined(__sun)
+# include <strings.h> // for strncmp()
+#endif
+
namespace Spiff {
Modified: trunk/src/SpiffReader.cpp
===================================================================
--- trunk/src/SpiffReader.cpp 2008-11-16 23:06:25 UTC (rev 505)
+++ trunk/src/SpiffReader.cpp 2008-11-17 20:02:19 UTC (rev 506)
@@ -2542,25 +2542,25 @@
}
-/*static*/ inline void SpiffReader::masterStart(void * userData, XML_Char const * fullName, XML_Char const ** atts) {
+/*static*/ void SpiffReader::masterStart(void * userData, XML_Char const * fullName, XML_Char const ** atts) {
SpiffReader * const parser = reinterpret_cast<SpiffReader *>(userData);
parser->handleStart(fullName, atts);
}
-/*static*/ inline void SpiffReader::masterEnd(void * userData, XML_Char const * fullName) {
+/*static*/ void SpiffReader::masterEnd(void * userData, XML_Char const * fullName) {
SpiffReader * const parser = reinterpret_cast<SpiffReader *>(userData);
parser->handleEnd(fullName);
}
-/*static*/ inline void SpiffReader::masterCharacters(void * userData, XML_Char const * s, int len) {
+/*static*/ void SpiffReader::masterCharacters(void * userData, XML_Char const * s, int len) {
SpiffReader * const parser = reinterpret_cast<SpiffReader *>(userData);
parser->handleCharacters(s, len);
}
-/*static*/ inline void
+/*static*/ void
SpiffReader::masterEntityDeclaration(void * userData, XML_Char const * entityName,
int /*is_parameter_entity*/, XML_Char const * value, int value_length,
XML_Char const * /*base*/, XML_Char const * /*systemId*/,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <har...@us...> - 2008-11-16 23:06:31
|
Revision: 505
http://libspiff.svn.sourceforge.net/libspiff/?rev=505&view=rev
Author: hartwork
Date: 2008-11-16 23:06:25 +0000 (Sun, 16 Nov 2008)
Log Message:
-----------
- Move some build files to build-aux directory
- Rename configure.in to configure.ac
Modified Paths:
--------------
trunk/ChangeLog
trunk/bootstrap.sh
trunk/test/CppTest/config.h.in
Added Paths:
-----------
trunk/configure.ac
Removed Paths:
-------------
trunk/configure.in
Property Changed:
----------------
trunk/
Property changes on: trunk
___________________________________________________________________
Modified: svn:ignore
- .deps
.libs
.project
Makefile
autom4te.cache
config.*
conftest.*
confdefs.h
libtool
acinclude.m4
aclocal.m4
config.guess
config.sub
configure
depcomp
INSTALL
install-sh
ltmain.sh
Makefile.in
missing
*.bz2
*.gz
*.lzma
*.zip
+ .deps
.libs
.project
Makefile
autom4te.cache
build-aux
config.log
config.status
conftest.*
confdefs.h
libtool
acinclude.m4
aclocal.m4
configure
INSTALL
Makefile.in
*.bz2
*.gz
*.lzma
*.zip
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-11-09 00:28:49 UTC (rev 504)
+++ trunk/ChangeLog 2008-11-16 23:06:25 UTC (rev 505)
@@ -2,6 +2,9 @@
* Fixed: Test suite compile fix for GCC 4.3
Thanks to Alexis Ballier for the patch!
+ * Changed: Build system changes:
+ - configure.in renamed to configure.ac
+ - some Autotools files moved to build-aux directory
2008-09-21 -- 1.0.0
Modified: trunk/bootstrap.sh
===================================================================
--- trunk/bootstrap.sh 2008-11-09 00:28:49 UTC (rev 504)
+++ trunk/bootstrap.sh 2008-11-16 23:06:25 UTC (rev 505)
@@ -27,9 +27,10 @@
fi
LIBTOOLIZE_VERSION=`${LIBTOOLIZE} --version | head -1 | grep -o '[^ ]*$'`
step "${LIBTOOLIZE}${WHITESPACE}${LIBTOOLIZE_VERSION}"
+mkdir -p build-aux
${LIBTOOLIZE} --copy --force >/dev/null || exit 1
-wget 'http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;f=build-aux/config.guess;hb=HEAD' -O config.guess &>/dev/null || exit 1
-grep '^timestamp=' config.guess >/dev/null || exit 1
+wget 'http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;f=build-aux/config.guess;hb=HEAD' -O build-aux/config.guess &>/dev/null || exit 1
+grep '^timestamp=' build-aux/config.guess >/dev/null || exit 1
## Autoconf
AUTOCONF_VERSION=`autoconf --version | head -1 | grep -o '[^ ]*$'`
Copied: trunk/configure.ac (from rev 503, trunk/configure.in)
===================================================================
--- trunk/configure.ac (rev 0)
+++ trunk/configure.ac 2008-11-16 23:06:25 UTC (rev 505)
@@ -0,0 +1,129 @@
+# Process this file with autoconf to produce a configure script.
+AC_PREREQ(2.61)
+AC_INIT(src/SpiffReader.cpp)
+AC_CONFIG_AUX_DIR([build-aux])
+AM_INIT_AUTOMAKE(libspiff, 1.0.0)
+AM_CONFIG_HEADER(test/CppTest/config.h)
+
+AC_PROG_LIBTOOL
+AC_PROG_INSTALL
+AC_PROG_CC
+AC_PROG_CXX
+AC_HEADER_STDC
+
+
+
+# These are for and from CppTest
+AC_CHECK_HEADERS(sys/time.h)
+AC_CHECK_FUNCS([gettimeofday])
+AC_MSG_CHECKING(for round)
+AC_TRY_COMPILE(
+ [ #include <math.h> ],
+ [ double d = round(1.0); ],
+ [ round=yes ],[ round=no ])
+AC_MSG_RESULT($round)
+if test "$round" = "yes"; then
+ AC_DEFINE([HAVE_ROUND],,[Defined if the function exists])
+fi
+
+
+
+# Expat
+AC_ARG_WITH(expat, [
+Dependency locations:
+ --with-expat=DIR override path of Expat
+ ("/lib" and "/include" is appended)], [
+ if test "x${withval}" = "x"; then
+ AC_MSG_ERROR([No path given for option --with-expat])
+ fi
+ LDFLAGS="-L${withval}/lib ${LDFLAGS}"
+ CPPFLAGS="-I${withval}/include ${CPPFLAGS}"
+], [])
+
+AC_ARG_WITH(expat-inc, [ --with-expat-inc=DIR override include path of Expat], [
+ if test "x${withval}" = "x"; then
+ AC_MSG_ERROR([No path given for option --with-expat-inc])
+ fi
+ CPPFLAGS="-I${withval} ${CPPFLAGS}"
+], [])
+
+AC_ARG_WITH(expat-lib, [ --with-expat-lib=DIR override library path of Expat], [
+ if test "x${withval}" = "x"; then
+ AC_MSG_ERROR([No path given for option --with-expat-lib])
+ fi
+ LDFLAGS="-L${withval} ${LDFLAGS}"
+], [])
+
+
+
+# uriparser
+AC_ARG_WITH(uriparser, [ --with-uriparser=DIR override path of uriparser
+ ("/lib" and "/include" is appended)], [
+ if test "x${withval}" = "x"; then
+ AC_MSG_ERROR([No path given for option --with-uriparser])
+ fi
+ LDFLAGS="-L${withval}/lib ${LDFLAGS}"
+ CPPFLAGS="-I${withval}/include ${CPPFLAGS}"
+], [])
+
+AC_ARG_WITH(uriparser-inc, [ --with-uriparser-inc=D override include path of uriparser], [
+ if test "x${withval}" = "x"; then
+ AC_MSG_ERROR([No path given for option --with-uriparser-inc])
+ fi
+ CPPFLAGS="-I${withval} ${CPPFLAGS}"
+], [])
+
+AC_ARG_WITH(uriparser-lib, [ --with-uriparser-lib=D override library path of uriparser], [
+ if test "x${withval}" = "x"; then
+ AC_MSG_ERROR([No path given for option --with-uriparser-lib])
+ fi
+ LDFLAGS="-L${withval} ${LDFLAGS}"
+], [])
+
+
+
+# Local headers must come very first. Otherwise we
+# risk including headers of an already installed
+# libSpiff version if its path is in CPPFLAGS
+CPPFLAGS="-I${srcdir}/include ${CPPFLAGS}"
+
+
+
+# Append $prefix as a fallback at the very end
+if test "x${prefix}" != "xNONE"; then
+ WORKING_PREFIX=${prefix}
+else
+ WORKING_PREFIX=${ac_default_prefix}
+fi
+LDFLAGS="${LDFLAGS} -L${WORKING_PREFIX}/lib"
+CPPFLAGS="${CPPFLAGS} -I${WORKING_PREFIX}/include"
+
+
+
+# Check presence
+EXPAT_MISSING="Please install expat 1.95.8 or later.
+ On a Debian-based system enter 'sudo apt-get install libexpat-dev'."
+AC_CHECK_LIB(expat, XML_ResumeParser,, AC_MSG_ERROR(${EXPAT_MISSING}))
+AC_CHECK_HEADER(expat.h,, AC_MSG_ERROR(${EXPAT_MISSING}))
+
+URIPARSER_MISSING="Please install uriparser 0.7.2 or later.
+ On a Debian-based system enter 'sudo apt-get install liburiparser-dev'."
+AC_CHECK_LIB(uriparser, uriParseUriA,, AC_MSG_ERROR(${URIPARSER_MISSING}))
+AC_CHECK_HEADER(uriparser/Uri.h,, AC_MSG_ERROR(${URIPARSER_MISSING}))
+
+URIPARSER_TOO_OLD="uriparser 0.7.2 or later is required, your copy is too old."
+AC_COMPILE_IFELSE([
+#include <uriparser/Uri.h>
+#if (defined(URI_VER_MAJOR) && defined(URI_VER_MINOR) && defined(URI_VER_RELEASE) \
+&& ((URI_VER_MAJOR > 0) \
+|| ((URI_VER_MAJOR == 0) && (URI_VER_MINOR > 7)) \
+|| ((URI_VER_MAJOR == 0) && (URI_VER_MINOR == 7) && (URI_VER_RELEASE >= 2)) \
+))
+/* FINE */
+#else
+# error uriparser not recent enough
+#endif
+],,AC_MSG_ERROR(${URIPARSER_TOO_OLD}))
+
+
+AC_OUTPUT(Makefile)
Property changes on: trunk/configure.ac
___________________________________________________________________
Added: svn:mergeinfo
+
Deleted: trunk/configure.in
===================================================================
--- trunk/configure.in 2008-11-09 00:28:49 UTC (rev 504)
+++ trunk/configure.in 2008-11-16 23:06:25 UTC (rev 505)
@@ -1,128 +0,0 @@
-# Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.61)
-AC_INIT(src/SpiffReader.cpp)
-AM_INIT_AUTOMAKE(libspiff, 1.0.0)
-AM_CONFIG_HEADER(test/CppTest/config.h)
-
-AC_PROG_LIBTOOL
-AC_PROG_INSTALL
-AC_PROG_CC
-AC_PROG_CXX
-AC_HEADER_STDC
-
-
-
-# These are for and from CppTest
-AC_CHECK_HEADERS(sys/time.h)
-AC_CHECK_FUNCS([gettimeofday])
-AC_MSG_CHECKING(for round)
-AC_TRY_COMPILE(
- [ #include <math.h> ],
- [ double d = round(1.0); ],
- [ round=yes ],[ round=no ])
-AC_MSG_RESULT($round)
-if test "$round" = "yes"; then
- AC_DEFINE([HAVE_ROUND],,[Defined if the function exists])
-fi
-
-
-
-# Expat
-AC_ARG_WITH(expat, [
-Dependency locations:
- --with-expat=DIR override path of Expat
- ("/lib" and "/include" is appended)], [
- if test "x${withval}" = "x"; then
- AC_MSG_ERROR([No path given for option --with-expat])
- fi
- LDFLAGS="-L${withval}/lib ${LDFLAGS}"
- CPPFLAGS="-I${withval}/include ${CPPFLAGS}"
-], [])
-
-AC_ARG_WITH(expat-inc, [ --with-expat-inc=DIR override include path of Expat], [
- if test "x${withval}" = "x"; then
- AC_MSG_ERROR([No path given for option --with-expat-inc])
- fi
- CPPFLAGS="-I${withval} ${CPPFLAGS}"
-], [])
-
-AC_ARG_WITH(expat-lib, [ --with-expat-lib=DIR override library path of Expat], [
- if test "x${withval}" = "x"; then
- AC_MSG_ERROR([No path given for option --with-expat-lib])
- fi
- LDFLAGS="-L${withval} ${LDFLAGS}"
-], [])
-
-
-
-# uriparser
-AC_ARG_WITH(uriparser, [ --with-uriparser=DIR override path of uriparser
- ("/lib" and "/include" is appended)], [
- if test "x${withval}" = "x"; then
- AC_MSG_ERROR([No path given for option --with-uriparser])
- fi
- LDFLAGS="-L${withval}/lib ${LDFLAGS}"
- CPPFLAGS="-I${withval}/include ${CPPFLAGS}"
-], [])
-
-AC_ARG_WITH(uriparser-inc, [ --with-uriparser-inc=D override include path of uriparser], [
- if test "x${withval}" = "x"; then
- AC_MSG_ERROR([No path given for option --with-uriparser-inc])
- fi
- CPPFLAGS="-I${withval} ${CPPFLAGS}"
-], [])
-
-AC_ARG_WITH(uriparser-lib, [ --with-uriparser-lib=D override library path of uriparser], [
- if test "x${withval}" = "x"; then
- AC_MSG_ERROR([No path given for option --with-uriparser-lib])
- fi
- LDFLAGS="-L${withval} ${LDFLAGS}"
-], [])
-
-
-
-# Local headers must come very first. Otherwise we
-# risk including headers of an already installed
-# libSpiff version if its path is in CPPFLAGS
-CPPFLAGS="-I${srcdir}/include ${CPPFLAGS}"
-
-
-
-# Append $prefix as a fallback at the very end
-if test "x${prefix}" != "xNONE"; then
- WORKING_PREFIX=${prefix}
-else
- WORKING_PREFIX=${ac_default_prefix}
-fi
-LDFLAGS="${LDFLAGS} -L${WORKING_PREFIX}/lib"
-CPPFLAGS="${CPPFLAGS} -I${WORKING_PREFIX}/include"
-
-
-
-# Check presence
-EXPAT_MISSING="Please install expat 1.95.8 or later.
- On a Debian-based system enter 'sudo apt-get install libexpat-dev'."
-AC_CHECK_LIB(expat, XML_ResumeParser,, AC_MSG_ERROR(${EXPAT_MISSING}))
-AC_CHECK_HEADER(expat.h,, AC_MSG_ERROR(${EXPAT_MISSING}))
-
-URIPARSER_MISSING="Please install uriparser 0.7.2 or later.
- On a Debian-based system enter 'sudo apt-get install liburiparser-dev'."
-AC_CHECK_LIB(uriparser, uriParseUriA,, AC_MSG_ERROR(${URIPARSER_MISSING}))
-AC_CHECK_HEADER(uriparser/Uri.h,, AC_MSG_ERROR(${URIPARSER_MISSING}))
-
-URIPARSER_TOO_OLD="uriparser 0.7.2 or later is required, your copy is too old."
-AC_COMPILE_IFELSE([
-#include <uriparser/Uri.h>
-#if (defined(URI_VER_MAJOR) && defined(URI_VER_MINOR) && defined(URI_VER_RELEASE) \
-&& ((URI_VER_MAJOR > 0) \
-|| ((URI_VER_MAJOR == 0) && (URI_VER_MINOR > 7)) \
-|| ((URI_VER_MAJOR == 0) && (URI_VER_MINOR == 7) && (URI_VER_RELEASE >= 2)) \
-))
-/* FINE */
-#else
-# error uriparser not recent enough
-#endif
-],,AC_MSG_ERROR(${URIPARSER_TOO_OLD}))
-
-
-AC_OUTPUT(Makefile)
Modified: trunk/test/CppTest/config.h.in
===================================================================
--- trunk/test/CppTest/config.h.in 2008-11-09 00:28:49 UTC (rev 504)
+++ trunk/test/CppTest/config.h.in 2008-11-16 23:06:25 UTC (rev 505)
@@ -1,4 +1,4 @@
-/* test/CppTest/config.h.in. Generated from configure.in by autoheader. */
+/* test/CppTest/config.h.in. Generated from configure.ac by autoheader. */
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <har...@us...> - 2008-11-09 00:28:53
|
Revision: 504
http://libspiff.svn.sourceforge.net/libspiff/?rev=504&view=rev
Author: hartwork
Date: 2008-11-09 00:28:49 +0000 (Sun, 09 Nov 2008)
Log Message:
-----------
Boilerplate code
Modified Paths:
--------------
trunk/include/spiff/ZirkorosOnline/ZirkorosOnlineTrackExtension.h
trunk/include/spiff/ZirkorosOnline/ZirkorosOnlineTrackExtensionReader.h
trunk/src/ZirkorosOnline/ZirkorosOnlineTrackExtension.cpp
trunk/src/ZirkorosOnline/ZirkorosOnlineTrackExtensionReader.cpp
Modified: trunk/include/spiff/ZirkorosOnline/ZirkorosOnlineTrackExtension.h
===================================================================
--- trunk/include/spiff/ZirkorosOnline/ZirkorosOnlineTrackExtension.h 2008-11-08 21:34:56 UTC (rev 503)
+++ trunk/include/spiff/ZirkorosOnline/ZirkorosOnlineTrackExtension.h 2008-11-09 00:28:49 UTC (rev 504)
@@ -40,3 +40,64 @@
* Sebastian Pipping, sp...@xi...
*/
+/**
+ * @file ZirkorosOnlineTrackExtension.h
+ * Interface of ZirkorosOnlineTrackExtension.
+ */
+
+#ifndef SPIFF_ZIRKOROS_ONLINE_TRACK_EXTENSION_H
+#define SPIFF_ZIRKOROS_ONLINE_TRACK_EXTENSION_H
+
+
+#include "../SpiffExtension.h"
+
+namespace Spiff {
+namespace ZirkorosOnline {
+
+
+class ZirkorosOnlineTrackExtensionPrivate;
+
+
+/**
+ * Represents a Zirkoros Online track extension.
+ */
+class ZirkorosOnlineTrackExtension : public SpiffExtension {
+
+private:
+ /// @cond DOXYGEN_NON_API
+ ZirkorosOnlineTrackExtensionPrivate * const d; ///< D pointer
+ /// @endcond
+
+public:
+ /**
+ * Creates a new Zirkoros Online playlist extension.
+ */
+ // TODO constructor
+
+ /**
+ * Copy constructor.
+ *
+ * @param source Source to copy from
+ */
+ ZirkorosOnlineTrackExtension(ZirkorosOnlineTrackExtension const & source);
+
+ /**
+ * Assignment operator.
+ *
+ * @param source Source to copy from
+ */
+ ZirkorosOnlineTrackExtension & operator=(ZirkorosOnlineTrackExtension const & source);
+
+ /**
+ * Destroys this extension.
+ */
+ ~ZirkorosOnlineTrackExtension();
+
+ // TODO getters/setters
+};
+
+
+}
+}
+
+#endif // SPIFF_ZIRKOROS_ONLINE_TRACK_EXTENSION_H
Modified: trunk/include/spiff/ZirkorosOnline/ZirkorosOnlineTrackExtensionReader.h
===================================================================
--- trunk/include/spiff/ZirkorosOnline/ZirkorosOnlineTrackExtensionReader.h 2008-11-08 21:34:56 UTC (rev 503)
+++ trunk/include/spiff/ZirkorosOnline/ZirkorosOnlineTrackExtensionReader.h 2008-11-09 00:28:49 UTC (rev 504)
@@ -40,3 +40,71 @@
* Sebastian Pipping, sp...@xi...
*/
+/**
+ * @file ZirkorosOnlineTrackExtensionReader.h
+ * Interface of ZirkorosOnlineTrackExtensionReader.
+ */
+
+#ifndef SPIFF_ZIRKOROS_ONLINE_TRACK_EXTENSION_READER_H
+#define SPIFF_ZIRKOROS_ONLINE_TRACK_EXTENSION_READER_H
+
+
+#include "../SpiffExtensionReader.h"
+
+namespace Spiff {
+namespace ZirkorosOnline {
+
+
+class ZirkorosOnlineTrackExtensionReaderPrivate;
+
+
+/**
+ * Reads a Zirkoros Online track extension.
+ */
+class ZirkorosOnlineTrackExtensionReader : public SpiffExtensionReader {
+
+private:
+ /// @cond DOXYGEN_NON_API
+ ZirkorosOnlineTrackExtensionReaderPrivate * const d; ///< D pointer
+ /// @endcond
+
+public:
+ /**
+ * Creates a new Zirkoros Online track extension reader.
+ */
+ // TODO constructor
+
+ /**
+ * Copy constructor.
+ *
+ * @param source Source to copy from
+ */
+ ZirkorosOnlineTrackExtensionReader(ZirkorosOnlineTrackExtensionReader const & source);
+
+ /**
+ * Assignment operator.
+ *
+ * @param source Source to copy from
+ */
+ ZirkorosOnlineTrackExtensionReader & operator=(ZirkorosOnlineTrackExtensionReader const & source);
+
+ /**
+ * Detroys this extension reader.
+ */
+ ~ZirkorosOnlineTrackExtensionReader();
+
+private:
+ bool handleExtensionStart(XML_Char const * fullName,
+ XML_Char const ** atts);
+ bool handleExtensionEnd(XML_Char const * fullName);
+ bool handleExtensionCharacters(XML_Char const * s, int len);
+ SpiffExtension * wrap();
+ SpiffExtensionReader * createBrother(SpiffReader * reader) const;
+
+};
+
+
+}
+}
+
+#endif // SPIFF_ZIRKOROS_ONLINE_TRACK_EXTENSION_READER_H
Modified: trunk/src/ZirkorosOnline/ZirkorosOnlineTrackExtension.cpp
===================================================================
--- trunk/src/ZirkorosOnline/ZirkorosOnlineTrackExtension.cpp 2008-11-08 21:34:56 UTC (rev 503)
+++ trunk/src/ZirkorosOnline/ZirkorosOnlineTrackExtension.cpp 2008-11-09 00:28:49 UTC (rev 504)
@@ -40,3 +40,54 @@
* Sebastian Pipping, sp...@xi...
*/
+/**
+ * @file ZirkorosOnlineTrackExtension.cpp
+ * Implementation of ZirkorosOnlineTrackExtension.
+ */
+
+#include <spiff/ZirkorosOnline/ZirkorosOnlineTrackExtension.h>
+#include <spiff/ZirkorosOnline/ZirkorosOnlineTrackExtensionWriter.h>
+
+namespace Spiff {
+namespace ZirkorosOnline {
+
+
+/// @cond DOXYGEN_NON_API
+
+/**
+ * D object for ZirkorosOnlineTrackExtension.
+ */
+class ZirkorosOnlineTrackExtensionPrivate {
+
+ friend class ZirkorosOnlineTrackExtension;
+
+ // TODO members
+};
+
+/// @endcond
+
+
+ZirkorosOnlineTrackExtension::ZirkorosOnlineTrackExtension(ZirkorosOnlineTrackExtension const & source)
+ : SpiffExtension(source),
+ d(new ZirkorosOnlineTrackExtensionPrivate(*(source.d))) {
+ // noop
+}
+
+
+ZirkorosOnlineTrackExtension &
+ZirkorosOnlineTrackExtension::operator=(ZirkorosOnlineTrackExtension const & source) {
+ if (this != &source) {
+ SpiffExtension::operator=(source);
+ *(this->d) = *(source.d);
+ }
+ return *this;
+}
+
+
+ZirkorosOnlineTrackExtension::~ZirkorosOnlineTrackExtension() {
+ delete this->d;
+}
+
+
+}
+}
Modified: trunk/src/ZirkorosOnline/ZirkorosOnlineTrackExtensionReader.cpp
===================================================================
--- trunk/src/ZirkorosOnline/ZirkorosOnlineTrackExtensionReader.cpp 2008-11-08 21:34:56 UTC (rev 503)
+++ trunk/src/ZirkorosOnline/ZirkorosOnlineTrackExtensionReader.cpp 2008-11-09 00:28:49 UTC (rev 504)
@@ -40,3 +40,96 @@
* Sebastian Pipping, sp...@xi...
*/
+/**
+ * @file ZirkorosOnlineTrackExtensionReader.cpp
+ * Implementation of ZirkorosOnlineTrackExtensionReader.
+ */
+
+#include <spiff/ZirkorosOnline/ZirkorosOnlineTrackExtensionReader.h>
+#include <spiff/ZirkorosOnline/ZirkorosOnlineTrackExtension.h>
+
+
+namespace Spiff {
+namespace ZirkorosOnline {
+
+
+/// @cond DOXYGEN_NON_API
+
+/**
+ * D object for ZirkorosOnlineTrackExtensionReader.
+ */
+class ZirkorosOnlineTrackExtensionReaderPrivate {
+
+ friend class ZirkorosOnlineTrackExtensionReader;
+
+ // TODO members
+};
+
+/// @endcond
+
+
+ZirkorosOnlineTrackExtensionReader::ZirkorosOnlineTrackExtensionReader(
+ ZirkorosOnlineTrackExtensionReader const & source)
+ : SpiffExtensionReader(source),
+ d(new ZirkorosOnlineTrackExtensionReaderPrivate(*(source.d))) {
+ // noop
+}
+
+
+ZirkorosOnlineTrackExtensionReader &
+ZirkorosOnlineTrackExtensionReader::operator=(
+ ZirkorosOnlineTrackExtensionReader const & source) {
+ if (this != &source) {
+ SpiffExtensionReader::operator=(source);
+ *(this->d) = *(source.d);
+ }
+ return *this;
+}
+
+
+ZirkorosOnlineTrackExtensionReader::~ZirkorosOnlineTrackExtensionReader() {
+ delete this->d;
+}
+
+
+bool
+ZirkorosOnlineTrackExtensionReader::handleExtensionStart(
+ XML_Char const * fullName, XML_Char const ** atts) {
+ // TODO
+ return true;
+}
+
+
+bool
+ZirkorosOnlineTrackExtensionReader::handleExtensionEnd(
+ XML_Char const * fullName) {
+ // TODO
+ return true;
+}
+
+
+bool
+ZirkorosOnlineTrackExtensionReader::handleExtensionCharacters(
+ XML_Char const * s, int len) {
+ // TODO
+ return true;
+}
+
+
+SpiffExtension *
+ZirkorosOnlineTrackExtensionReader::wrap() {
+ // TODO
+ return NULL;
+}
+
+
+SpiffExtensionReader *
+ZirkorosOnlineTrackExtensionReader::createBrother(
+ SpiffReader * reader) const {
+ // TODO
+ return NULL;
+}
+
+
+}
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <har...@us...> - 2008-11-08 22:22:01
|
Revision: 503
http://libspiff.svn.sourceforge.net/libspiff/?rev=503&view=rev
Author: hartwork
Date: 2008-11-08 21:34:56 +0000 (Sat, 08 Nov 2008)
Log Message:
-----------
Fill in address
Modified Paths:
--------------
trunk/include/spiff/ZirkorosOnline/ZirkorosOnlineTrackExtension.h
trunk/include/spiff/ZirkorosOnline/ZirkorosOnlineTrackExtensionReader.h
trunk/include/spiff/ZirkorosOnline/ZirkorosOnlineTrackExtensionWriter.h
trunk/src/ZirkorosOnline/ZirkorosOnlineTrackExtension.cpp
trunk/src/ZirkorosOnline/ZirkorosOnlineTrackExtensionReader.cpp
trunk/src/ZirkorosOnline/ZirkorosOnlineTrackExtensionWriter.cpp
trunk/test/ZirkorosOnline/ZirkorosOnlineSuite.cpp
trunk/test/ZirkorosOnline/ZirkorosOnlineSuite.h
Modified: trunk/include/spiff/ZirkorosOnline/ZirkorosOnlineTrackExtension.h
===================================================================
--- trunk/include/spiff/ZirkorosOnline/ZirkorosOnlineTrackExtension.h 2008-11-08 13:33:41 UTC (rev 502)
+++ trunk/include/spiff/ZirkorosOnline/ZirkorosOnlineTrackExtension.h 2008-11-08 21:34:56 UTC (rev 503)
@@ -36,7 +36,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * Pekka Lamminranta, TODO
+ * Pekka Lamminranta, pe...@ja...
* Sebastian Pipping, sp...@xi...
*/
Modified: trunk/include/spiff/ZirkorosOnline/ZirkorosOnlineTrackExtensionReader.h
===================================================================
--- trunk/include/spiff/ZirkorosOnline/ZirkorosOnlineTrackExtensionReader.h 2008-11-08 13:33:41 UTC (rev 502)
+++ trunk/include/spiff/ZirkorosOnline/ZirkorosOnlineTrackExtensionReader.h 2008-11-08 21:34:56 UTC (rev 503)
@@ -36,7 +36,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * Pekka Lamminranta, TODO
+ * Pekka Lamminranta, pe...@ja...
* Sebastian Pipping, sp...@xi...
*/
Modified: trunk/include/spiff/ZirkorosOnline/ZirkorosOnlineTrackExtensionWriter.h
===================================================================
--- trunk/include/spiff/ZirkorosOnline/ZirkorosOnlineTrackExtensionWriter.h 2008-11-08 13:33:41 UTC (rev 502)
+++ trunk/include/spiff/ZirkorosOnline/ZirkorosOnlineTrackExtensionWriter.h 2008-11-08 21:34:56 UTC (rev 503)
@@ -36,7 +36,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * Pekka Lamminranta, TODO
+ * Pekka Lamminranta, pe...@ja...
* Sebastian Pipping, sp...@xi...
*/
Modified: trunk/src/ZirkorosOnline/ZirkorosOnlineTrackExtension.cpp
===================================================================
--- trunk/src/ZirkorosOnline/ZirkorosOnlineTrackExtension.cpp 2008-11-08 13:33:41 UTC (rev 502)
+++ trunk/src/ZirkorosOnline/ZirkorosOnlineTrackExtension.cpp 2008-11-08 21:34:56 UTC (rev 503)
@@ -36,7 +36,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * Pekka Lamminranta, TODO
+ * Pekka Lamminranta, pe...@ja...
* Sebastian Pipping, sp...@xi...
*/
Modified: trunk/src/ZirkorosOnline/ZirkorosOnlineTrackExtensionReader.cpp
===================================================================
--- trunk/src/ZirkorosOnline/ZirkorosOnlineTrackExtensionReader.cpp 2008-11-08 13:33:41 UTC (rev 502)
+++ trunk/src/ZirkorosOnline/ZirkorosOnlineTrackExtensionReader.cpp 2008-11-08 21:34:56 UTC (rev 503)
@@ -36,7 +36,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * Pekka Lamminranta, TODO
+ * Pekka Lamminranta, pe...@ja...
* Sebastian Pipping, sp...@xi...
*/
Modified: trunk/src/ZirkorosOnline/ZirkorosOnlineTrackExtensionWriter.cpp
===================================================================
--- trunk/src/ZirkorosOnline/ZirkorosOnlineTrackExtensionWriter.cpp 2008-11-08 13:33:41 UTC (rev 502)
+++ trunk/src/ZirkorosOnline/ZirkorosOnlineTrackExtensionWriter.cpp 2008-11-08 21:34:56 UTC (rev 503)
@@ -36,7 +36,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * Pekka Lamminranta, TODO
+ * Pekka Lamminranta, pe...@ja...
* Sebastian Pipping, sp...@xi...
*/
Modified: trunk/test/ZirkorosOnline/ZirkorosOnlineSuite.cpp
===================================================================
--- trunk/test/ZirkorosOnline/ZirkorosOnlineSuite.cpp 2008-11-08 13:33:41 UTC (rev 502)
+++ trunk/test/ZirkorosOnline/ZirkorosOnlineSuite.cpp 2008-11-08 21:34:56 UTC (rev 503)
@@ -19,7 +19,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
- * Pekka Lamminranta, TODO
+ * Pekka Lamminranta, pe...@ja...
* Sebastian Pipping, sp...@xi...
*/
Modified: trunk/test/ZirkorosOnline/ZirkorosOnlineSuite.h
===================================================================
--- trunk/test/ZirkorosOnline/ZirkorosOnlineSuite.h 2008-11-08 13:33:41 UTC (rev 502)
+++ trunk/test/ZirkorosOnline/ZirkorosOnlineSuite.h 2008-11-08 21:34:56 UTC (rev 503)
@@ -19,6 +19,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
- * Pekka Lamminranta, TODO
+ * Pekka Lamminranta, pe...@ja...
* Sebastian Pipping, sp...@xi...
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
