[Libspiff-commits] SF.net SVN: libspiff:[515] trunk
Brought to you by:
hartwork
Menu
▾
▴
[Libspiff-commits] SF.net SVN: libspiff:[515] trunk
|
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] |
