=== added file '.gitignore' --- .gitignore 1970-01-01 00:00:00 +0000 +++ .gitignore 2012-06-25 05:56:21 +0000 @@ -0,0 +1,9 @@ +CMakeCache.txt +CMakeFiles/ +Doxyfile +Makefile +cmake_install.cmake +config.h +libmusicbrainz4.pc +docs/ +install_manifest.txt === modified file 'CMakeLists.txt' --- CMakeLists.txt 2012-02-01 17:18:10 +0000 +++ CMakeLists.txt 2012-06-25 05:56:21 +0000 @@ -1,15 +1,15 @@ cmake_minimum_required(VERSION 2.6) PROJECT(libmusicbrainz4) -SET(PROJECT_VERSION 4.0.0) +SET(PROJECT_VERSION 4.0.3) # 1. If the library source code has changed at all since the last update, then increment revision. # 2. If any interfaces have been added, removed, or changed since the last update, increment current, and set revision to 0. # 3. If any interfaces have been added since the last public release, then increment age. # 4. If any interfaces have been removed since the last public release, then set age to 0. -SET(musicbrainz4_SOVERSION_CURRENT 3) -SET(musicbrainz4_SOVERSION_REVISION 0) -SET(musicbrainz4_SOVERSION_AGE 0) +SET(musicbrainz4_SOVERSION_CURRENT 5) +SET(musicbrainz4_SOVERSION_REVISION 1) +SET(musicbrainz4_SOVERSION_AGE 2) MATH(EXPR musicbrainz4_SOVERSION_MAJOR "${musicbrainz4_SOVERSION_CURRENT} - ${musicbrainz4_SOVERSION_AGE}") MATH(EXPR musicbrainz4_SOVERSION_MINOR "${musicbrainz4_SOVERSION_AGE}") @@ -47,6 +47,5 @@ ADD_CUSTOM_TARGET(dist rm -rf "libmusicbrainz-${PROJECT_VERSION}" - COMMAND svn export http://svn.musicbrainz.org/libmusicbrainz/trunk "libmusicbrainz-${PROJECT_VERSION}" - COMMAND tar -zcvf "libmusicbrainz-${PROJECT_VERSION}.tar.gz" "libmusicbrainz-${PROJECT_VERSION}" + COMMAND git archive --prefix="libmusicbrainz-${PROJECT_VERSION}/" release-${PROJECT_VERSION} | gzip -9 > libmusicbrainz-${PROJECT_VERSION}.tar.gz ) === modified file 'Doxyfile.cmake' --- Doxyfile.cmake 2012-02-01 17:18:10 +0000 +++ Doxyfile.cmake 2012-06-25 05:56:21 +0000 @@ -16,5 +16,5 @@ FULL_PATH_NAMES = NO MACRO_EXPANSION = YES EXPAND_ONLY_PREDEF = YES -PREDEFINED = MB_API +PREDEFINED = LIBMB4_DEPRECATED(f)= REPEAT_BRIEF = NO === modified file 'NEWS.txt' --- NEWS.txt 2012-02-01 17:18:10 +0000 +++ NEWS.txt 2012-06-25 05:56:21 +0000 @@ -1,3 +1,29 @@ +Changes for libmusicbrainz 4.0.3 +-------------------------------- + + - Fix LMB-32 - Correctly ignore unrecognised nodes + - Don't compile using -Werror when building from tarball + +Changes for libmusicbrainz 4.0.2 +-------------------------------- + + - Add extra attributes to Alias + - Add IPI lists to Artist and Label + - Add 'Ended' to Lifespan + - Add PrimaryType and SecondaryTypeList to ReleaseGroup + - Add text based track number to Track + - Add ISWC list to Work + - Debug builds show queries and responses on stderr + - Documentation updates + +Changes for libmusicbrainz 4.0.1 +-------------------------------- + + - Fixed bug LMB-30 - Unable to access all relation lists on objects with + multiple relation lists + - Fixed bug LMB-31 - mb_relationlist_get_targettype always returns + "target-type" + Changes for libmusicbrainz 4.0.0 -------------------------------- === added file 'README.md' --- README.md 1970-01-01 00:00:00 +0000 +++ README.md 2012-06-25 05:56:21 +0000 @@ -0,0 +1,44 @@ +============================ + MusicBrainz Client Library +============================ + +Documentation +------------- + +To get started quickly have a look at the examples directory which +contains various sample programs. API documentation can be generated +using [Doxygen] (http://www.stack.nl/~dimitri/doxygen/). The online version of +the API documentation can be found at: + + http://metabrainz.github.com/libmusicbrainz/ + +Compiling and Linking +--------------------- + +This package provides a pkg-config script that returns the necessary compiler +and linker flags, as well as the version number. To build a small sample +program one would use: + + g++ -o test_app test_app.cpp `pkg-config libmusicbrainz4 --cflags --libs` + +If you don't want/can't use pkg-config and you are using the C API, make sure +you link in the C++ standard library: + + gcc -o test_app test_app.c -lmusicbrainz4 -lm -lstdc++ + +Contact +------- + +If you have any questions about this library, feel free to ask on the +MusicBrainz development mailing list: + + http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-devel + +Please submit bug reports to the MusicBrainz bug tracking system: + + http://tickets.musicbrainz.org/browse/LMB + +You can find out more about the MusicBrainz project by visiting its +site: + + http://musicbrainz.org/ === removed file 'README.txt' --- README.txt 2012-02-01 17:18:10 +0000 +++ README.txt 1970-01-01 00:00:00 +0000 @@ -1,44 +0,0 @@ -============================ - MusicBrainz Client Library -============================ - -Documentation -============= - -To get started quickly have a look at the examples directory which -contains various sample programs. API documentation can be generated -using Doxygen (http://www.stack.nl/~dimitri/doxygen/). Online version of -the API documentation can be found at: - - http://users.musicbrainz.org/~luks/docs/libmusicbrainz4/ - -Compiling and Linking -===================== - -This package provides a pkg-config script that returns the necessary compiler -and linker flags, as well as the version number. To build a small sample -program one would use: - - g++ -o test_app test_app.cpp `pkg-config libmusicbrainz4 --cflags --libs` - -If you don't want/can't use pkg-config and you are using the C API, make sure -you link in the C++ standard library: - - gcc -o test_app test_app.c -lmusicbrainz4 -lm -lstdc++ - -Contact -======= - -If you have any questions about this library, feel free to ask on the -MusicBrainz development mailing list: - - http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-devel - -Please submit bug reports to the MusicBrainz bug tracking system: - - http://tickets.musicbrainz.org/ - -You can find out more about the MusicBrainz project by visiting its -site: - - http://musicbrainz.org/ === modified file 'config.h.cmake' --- config.h.cmake 2012-02-01 17:18:10 +0000 +++ config.h.cmake 2012-06-25 05:56:21 +0000 @@ -4,6 +4,4 @@ #define PACKAGE "${PROJECT_NAME}" #define VERSION "${PROJECT_VERSION}" -#cmakedefine DISCID_FOUND - #endif === modified file 'debian/changelog' --- debian/changelog 2012-02-01 17:18:10 +0000 +++ debian/changelog 2012-06-25 05:56:21 +0000 @@ -1,3 +1,11 @@ +libmusicbrainz (4.0.3-0ubuntu1) quantal; urgency=low + + * New upstream release (LP: #1005075). + * Bump Standards-Version to 3.9.3. + * Bump Build-Depends for debhelper to >= 9. + + -- Logan Rosen Mon, 25 Jun 2012 01:45:21 -0400 + libmusicbrainz (4.0.0-0ubuntu1) precise; urgency=low * Merge from unreleased Debian git. === modified file 'debian/control' --- debian/control 2012-02-01 17:18:10 +0000 +++ debian/control 2012-06-25 05:56:21 +0000 @@ -1,11 +1,11 @@ Source: libmusicbrainz Priority: extra Maintainer: Timo Aaltonen -Build-Depends: debhelper (>= 8.1.3~), +Build-Depends: debhelper (>= 9), cmake, libneon27-gnutls-dev| libneon-dev, doxygen, -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Section: libs Homepage: http://musicbrainz.org/doc/libmusicbrainz Vcs-Git: git://git.debian.org/collab-maint/libmusicbrainz.git === added file 'examples/.gitignore' --- examples/.gitignore 1970-01-01 00:00:00 +0000 +++ examples/.gitignore 2012-06-25 05:56:21 +0000 @@ -0,0 +1,8 @@ +CMakeFiles/ +Makefile +cdlookup +cdlookup_c +cmake_install.cmake +collections +search +search_c === modified file 'examples/CMakeLists.txt' --- examples/CMakeLists.txt 2012-02-01 17:18:10 +0000 +++ examples/CMakeLists.txt 2012-06-25 05:56:21 +0000 @@ -8,10 +8,16 @@ ADD_EXECUTABLE(collections collections.cc) IF(CMAKE_COMPILER_IS_GNUCXX) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -Wextra -pedantic-errors") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic-errors") + IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../.git) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") + ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../.git) ENDIF(CMAKE_COMPILER_IS_GNUCXX) IF(CMAKE_COMPILER_IS_GNUCC) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror -Wextra -pedantic-errors") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -pedantic-errors") + IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../.git) + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror") + ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../.git) ENDIF(CMAKE_COMPILER_IS_GNUCC) === modified file 'examples/cdlookup.cc' --- examples/cdlookup.cc 2012-02-01 17:18:10 +0000 +++ examples/cdlookup.cc 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: cdlookup.cc 13266 2011-08-25 12:56:47Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ === modified file 'examples/cdlookup_c.c' --- examples/cdlookup_c.c 2012-02-01 17:18:10 +0000 +++ examples/cdlookup_c.c 2012-06-25 05:56:21 +0000 @@ -10,7 +10,7 @@ modify it under the terms of v2 of the GNU Lesser General Public License as published by the Free Software Foundation. - Flactag is distributed in the hope that it will be useful, + libmusicbrainz4 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. === modified file 'examples/collections.cc' --- examples/collections.cc 2012-02-01 17:18:10 +0000 +++ examples/collections.cc 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: collections.cc 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ === modified file 'examples/search.cc' --- examples/search.cc 2012-02-01 17:18:10 +0000 +++ examples/search.cc 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: search.cc 13254 2011-08-09 09:29:20Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ === modified file 'examples/search_c.c' --- examples/search_c.c 2012-02-01 17:18:10 +0000 +++ examples/search_c.c 2012-06-25 05:56:21 +0000 @@ -10,7 +10,7 @@ modify it under the terms of v2 of the GNU Lesser General Public License as published by the Free Software Foundation. - Flactag is distributed in the hope that it will be useful, + libmusicbrainz4 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. === added file 'include/musicbrainz4/.gitignore' --- include/musicbrainz4/.gitignore 1970-01-01 00:00:00 +0000 +++ include/musicbrainz4/.gitignore 2012-06-25 05:56:21 +0000 @@ -0,0 +1,1 @@ +mb4_c.h === modified file 'include/musicbrainz4/Alias.h' --- include/musicbrainz4/Alias.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/Alias.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: Alias.h 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ @@ -48,13 +48,18 @@ std::string Locale() const; std::string Text() const; + std::string SortName() const; + std::string Type() const; + std::string Primary() const; + std::string BeginDate() const; + std::string EndDate() const; virtual std::ostream& Serialise(std::ostream& os) const; static std::string GetElementName(); protected: - virtual bool ParseAttribute(const std::string& Name, const std::string& Value); - virtual bool ParseElement(const XMLNode& Node); + virtual void ParseAttribute(const std::string& Name, const std::string& Value); + virtual void ParseElement(const XMLNode& Node); private: CAliasPrivate * const m_d; === modified file 'include/musicbrainz4/AliasList.h' --- include/musicbrainz4/AliasList.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/AliasList.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: AliasList.h 13254 2011-08-09 09:29:20Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ === modified file 'include/musicbrainz4/Annotation.h' --- include/musicbrainz4/Annotation.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/Annotation.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: Annotation.h 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ @@ -55,8 +55,8 @@ static std::string GetElementName(); protected: - virtual bool ParseAttribute(const std::string& Name, const std::string& Value); - virtual bool ParseElement(const XMLNode& Node); + virtual void ParseAttribute(const std::string& Name, const std::string& Value); + virtual void ParseElement(const XMLNode& Node); private: CAnnotationPrivate * const m_d; === modified file 'include/musicbrainz4/AnnotationList.h' --- include/musicbrainz4/AnnotationList.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/AnnotationList.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: AnnotationList.h 13254 2011-08-09 09:29:20Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ === modified file 'include/musicbrainz4/Artist.h' --- include/musicbrainz4/Artist.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/Artist.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: Artist.h 13265 2011-08-25 12:53:44Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ @@ -29,6 +29,7 @@ #include #include "musicbrainz4/Entity.h" +#include "musicbrainz4/IPIList.h" #include "musicbrainz4/ReleaseList.h" #include "musicbrainz4/AliasList.h" #include "musicbrainz4/RecordingList.h" @@ -65,7 +66,20 @@ std::string Gender() const; std::string Country() const; std::string Disambiguation() const; - std::string IPI() const; + + /** + * @deprecated Returns one of the IPIs for this artist + * + * Returns one of the IPIs for this artist. To return all + * IPIs, see MusicBrainz4::CArtist::IPIList + * + * This method is deprecated, please use MusicBrainz4::CArtist::IPIList + * + * @return One of the IPIs for this artist + */ + + LIBMB4_DEPRECATED(MusicBrainz4::CArtist::IPIList) std::string IPI() const; + CIPIList *IPIList() const; CLifespan *Lifespan() const; CAliasList *AliasList() const; CRecordingList *RecordingList() const; @@ -73,7 +87,20 @@ CReleaseGroupList *ReleaseGroupList() const; CLabelList *LabelList() const; CWorkList *WorkList() const; - CRelationList *RelationList() const; + + /** + * @deprecated Returns the last relation list for this artist + * + * Returns the last relation list for this artist. To return all + * relation lists, see MusicBrainz4::CArtist::RelationListList + * + * This method is deprecated, please use MusicBrainz4::CArtist::RelationListList + * + * @return The last relation list for this artist + */ + + LIBMB4_DEPRECATED(MusicBrainz4::CArtist::RelationListList) CRelationList *RelationList() const; + CRelationListList *RelationListList() const; CTagList *TagList() const; CUserTagList *UserTagList() const; CRating *Rating() const; @@ -83,8 +110,8 @@ static std::string GetElementName(); protected: - virtual bool ParseAttribute(const std::string& Name, const std::string& Value); - virtual bool ParseElement(const XMLNode& Node); + virtual void ParseAttribute(const std::string& Name, const std::string& Value); + virtual void ParseElement(const XMLNode& Node); private: void Cleanup(); === modified file 'include/musicbrainz4/ArtistCredit.h' --- include/musicbrainz4/ArtistCredit.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/ArtistCredit.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: ArtistCredit.h 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ @@ -52,8 +52,8 @@ static std::string GetElementName(); protected: - virtual bool ParseAttribute(const std::string& Name, const std::string& Value); - virtual bool ParseElement(const XMLNode& Node); + virtual void ParseAttribute(const std::string& Name, const std::string& Value); + virtual void ParseElement(const XMLNode& Node); private: void Cleanup(); === modified file 'include/musicbrainz4/ArtistList.h' --- include/musicbrainz4/ArtistList.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/ArtistList.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: ArtistList.h 13254 2011-08-09 09:29:20Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ === modified file 'include/musicbrainz4/Attribute.h' --- include/musicbrainz4/Attribute.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/Attribute.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: Attribute.h 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ @@ -52,8 +52,8 @@ static std::string GetElementName(); protected: - virtual bool ParseAttribute(const std::string& Name, const std::string& Value); - virtual bool ParseElement(const XMLNode& Node); + virtual void ParseAttribute(const std::string& Name, const std::string& Value); + virtual void ParseElement(const XMLNode& Node); private: CAttributePrivate * const m_d; === modified file 'include/musicbrainz4/AttributeList.h' --- include/musicbrainz4/AttributeList.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/AttributeList.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: AttributeList.h 13254 2011-08-09 09:29:20Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ === modified file 'include/musicbrainz4/CDStub.h' --- include/musicbrainz4/CDStub.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/CDStub.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: CDStub.h 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ @@ -58,8 +58,8 @@ static std::string GetElementName(); protected: - virtual bool ParseAttribute(const std::string& Name, const std::string& Value); - virtual bool ParseElement(const XMLNode& Node); + virtual void ParseAttribute(const std::string& Name, const std::string& Value); + virtual void ParseElement(const XMLNode& Node); private: void Cleanup(); === modified file 'include/musicbrainz4/CDStubList.h' --- include/musicbrainz4/CDStubList.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/CDStubList.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: CDStubList.h 13254 2011-08-09 09:29:20Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ === modified file 'include/musicbrainz4/Collection.h' --- include/musicbrainz4/Collection.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/Collection.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: Collection.h 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ @@ -53,8 +53,8 @@ static std::string GetElementName(); protected: - virtual bool ParseAttribute(const std::string& Name, const std::string& Value); - virtual bool ParseElement(const XMLNode& Node); + virtual void ParseAttribute(const std::string& Name, const std::string& Value); + virtual void ParseElement(const XMLNode& Node); private: void Cleanup(); === modified file 'include/musicbrainz4/CollectionList.h' --- include/musicbrainz4/CollectionList.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/CollectionList.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: CollectionList.h 13254 2011-08-09 09:29:20Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ === modified file 'include/musicbrainz4/Disc.h' --- include/musicbrainz4/Disc.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/Disc.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: Disc.h 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ @@ -57,8 +57,8 @@ static std::string GetElementName(); protected: - virtual bool ParseAttribute(const std::string& Name, const std::string& Value); - virtual bool ParseElement(const XMLNode& Node); + virtual void ParseAttribute(const std::string& Name, const std::string& Value); + virtual void ParseElement(const XMLNode& Node); private: void Cleanup(); === modified file 'include/musicbrainz4/DiscList.h' --- include/musicbrainz4/DiscList.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/DiscList.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: DiscList.h 13254 2011-08-09 09:29:20Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ === modified file 'include/musicbrainz4/Entity.h' --- include/musicbrainz4/Entity.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/Entity.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: Entity.h 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ @@ -36,6 +36,8 @@ { class CEntityPrivate; + class CRelationListList; + class CEntity { public: @@ -46,7 +48,7 @@ virtual CEntity *Clone()=0; - bool Parse(const XMLNode& Node); + void Parse(const XMLNode& Node); std::map ExtAttributes() const; std::map ExtElements() const; @@ -55,19 +57,17 @@ static std::string GetElementName(); protected: + void ProcessRelationList(const XMLNode& Node, CRelationListList* & RetVal); + template - bool ProcessItem(const XMLNode& Node, T* & RetVal) + void ProcessItem(const XMLNode& Node, T* & RetVal) { RetVal=new T(Node); - - return true; } template - bool ProcessItem(const XMLNode& Node, T& RetVal) + void ProcessItem(const XMLNode& Node, T& RetVal) { - bool Ret=true; - std::stringstream os; if (Node.getText()) os << (const char *)Node.getText(); @@ -75,51 +75,39 @@ os >> RetVal; if (os.fail()) { - Ret=false; std::cerr << "Error parsing value '"; if (Node.getText()) std::cerr << Node.getText(); std::cerr << "'" << std::endl; } - - return Ret; } template - bool ProcessItem(const std::string& Text, T& RetVal) + void ProcessItem(const std::string& Text, T& RetVal) { - bool Ret=true; - std::stringstream os; os << Text; os >> RetVal; if (os.fail()) { - Ret=false; std::cerr << "Error parsing value '" << Text << "'" << std::endl; } - - return Ret; } - bool ProcessItem(const XMLNode& Node, std::string& RetVal) + void ProcessItem(const XMLNode& Node, std::string& RetVal) { if (Node.getText()) RetVal=Node.getText(); - - return true; - } - virtual bool ParseAttribute(const std::string& Name, const std::string& Value)=0; - virtual bool ParseElement(const XMLNode& Node)=0; + virtual void ParseAttribute(const std::string& Name, const std::string& Value)=0; + virtual void ParseElement(const XMLNode& Node)=0; private: CEntityPrivate *m_d; void Cleanup(); - }; } === modified file 'include/musicbrainz4/FreeDBDisc.h' --- include/musicbrainz4/FreeDBDisc.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/FreeDBDisc.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: FreeDBDisc.h 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ @@ -58,8 +58,8 @@ static std::string GetElementName(); protected: - virtual bool ParseAttribute(const std::string& Name, const std::string& Value); - virtual bool ParseElement(const XMLNode& Node); + virtual void ParseAttribute(const std::string& Name, const std::string& Value); + virtual void ParseElement(const XMLNode& Node); private: void Cleanup(); === modified file 'include/musicbrainz4/FreeDBDiscList.h' --- include/musicbrainz4/FreeDBDiscList.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/FreeDBDiscList.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: FreeDBDiscList.h 13254 2011-08-09 09:29:20Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ === modified file 'include/musicbrainz4/HTTPFetch.h' --- include/musicbrainz4/HTTPFetch.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/HTTPFetch.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: HTTPFetch.h 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ === added file 'include/musicbrainz4/IPI.h' --- include/musicbrainz4/IPI.h 1970-01-01 00:00:00 +0000 +++ include/musicbrainz4/IPI.h 2012-06-25 05:56:21 +0000 @@ -0,0 +1,63 @@ +/* -------------------------------------------------------------------------- + + libmusicbrainz4 - Client library to access MusicBrainz + + Copyright (C) 2012 Andrew Hawkins + + This file is part of libmusicbrainz4. + + This library is free software; you can redistribute it and/or + modify it under the terms of v2 of the GNU Lesser General Public + License as published by the Free Software Foundation. + + libmusicbrainz4 is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this library. If not, see . + + $Id$ + +----------------------------------------------------------------------------*/ + +#ifndef _MUSICBRAINZ4_IPI_H +#define _MUSICBRAINZ4_IPI_H + +#include +#include + +#include "musicbrainz4/Entity.h" + +#include "musicbrainz4/xmlParser.h" + +namespace MusicBrainz4 +{ + class CIPIPrivate; + + class CIPI: public CEntity + { + public: + CIPI(const XMLNode& Node=XMLNode::emptyNode()); + CIPI(const CIPI& Other); + CIPI& operator =(const CIPI& Other); + virtual ~CIPI(); + + virtual CIPI *Clone(); + + std::string IPI() const; + + virtual std::ostream& Serialise(std::ostream& os) const; + static std::string GetElementName(); + + protected: + virtual void ParseAttribute(const std::string& Name, const std::string& Value); + virtual void ParseElement(const XMLNode& Node); + + private: + CIPIPrivate * const m_d; + }; +} + +#endif === added file 'include/musicbrainz4/IPIList.h' --- include/musicbrainz4/IPIList.h 1970-01-01 00:00:00 +0000 +++ include/musicbrainz4/IPIList.h 2012-06-25 05:56:21 +0000 @@ -0,0 +1,37 @@ +/* -------------------------------------------------------------------------- + + libmusicbrainz4 - Client library to access MusicBrainz + + Copyright (C) 2011 Andrew Hawkins + + This file is part of libmusicbrainz4. + + This library is free software; you can redistribute it and/or + modify it under the terms of v2 of the GNU Lesser General Public + License as published by the Free Software Foundation. + + libmusicbrainz4 is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this library. If not, see . + + $Id$ + +----------------------------------------------------------------------------*/ + +#ifndef _MUSICBRAINZ4_IPI_LIST_H +#define _MUSICBRAINZ4_IPI_LIST_H + +#include "musicbrainz4/ListImpl.h" + +namespace MusicBrainz4 +{ + class CIPI; + + typedef CListImpl CIPIList; +} + +#endif === modified file 'include/musicbrainz4/ISRC.h' --- include/musicbrainz4/ISRC.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/ISRC.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: ISRC.h 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ @@ -51,8 +51,8 @@ static std::string GetElementName(); protected: - virtual bool ParseAttribute(const std::string& Name, const std::string& Value); - virtual bool ParseElement(const XMLNode& Node); + virtual void ParseAttribute(const std::string& Name, const std::string& Value); + virtual void ParseElement(const XMLNode& Node); private: void Cleanup(); === modified file 'include/musicbrainz4/ISRCList.h' --- include/musicbrainz4/ISRCList.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/ISRCList.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: ISRCList.h 13254 2011-08-09 09:29:20Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ === added file 'include/musicbrainz4/ISWC.h' --- include/musicbrainz4/ISWC.h 1970-01-01 00:00:00 +0000 +++ include/musicbrainz4/ISWC.h 2012-06-25 05:56:21 +0000 @@ -0,0 +1,65 @@ +/* -------------------------------------------------------------------------- + + libmusicbrainz4 - Client library to access MusicBrainz + + Copyright (C) 2012 Andrew Hawkins + + This file is part of libmusicbrainz4. + + This library is free software; you can redistribute it and/or + modify it under the terms of v2 of the GNU Lesser General Public + License as published by the Free Software Foundation. + + libmusicbrainz4 is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this library. If not, see . + + $Id$ + +----------------------------------------------------------------------------*/ + +#ifndef _MUSICBRAINZ4_ISWC_H +#define _MUSICBRAINZ4_ISWC_H + +#include +#include + +#include "musicbrainz4/Entity.h" + +#include "musicbrainz4/xmlParser.h" + +namespace MusicBrainz4 +{ + class CISWCPrivate; + + class CISWC: public CEntity + { + public: + CISWC(const XMLNode& Node=XMLNode::emptyNode()); + CISWC(const CISWC& Other); + CISWC& operator =(const CISWC& Other); + virtual ~CISWC(); + + virtual CISWC *Clone(); + + std::string ISWC() const; + + virtual std::ostream& Serialise(std::ostream& os) const; + static std::string GetElementName(); + + protected: + virtual void ParseAttribute(const std::string& Name, const std::string& Value); + virtual void ParseElement(const XMLNode& Node); + + private: + void Cleanup(); + + CISWCPrivate * const m_d; + }; +} + +#endif === added file 'include/musicbrainz4/ISWCList.h' --- include/musicbrainz4/ISWCList.h 1970-01-01 00:00:00 +0000 +++ include/musicbrainz4/ISWCList.h 2012-06-25 05:56:21 +0000 @@ -0,0 +1,62 @@ +/* -------------------------------------------------------------------------- + + libmusicbrainz4 - Client library to access MusicBrainz + + Copyright (C) 2012 Andrew Hawkins + + This file is part of libmusicbrainz4. + + This library is free software; you can redistribute it and/or + modify it under the terms of v2 of the GNU Lesser General Public + License as published by the Free Software Foundation. + + libmusicbrainz4 is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this library. If not, see . + + $Id$ + +----------------------------------------------------------------------------*/ + +#ifndef _MUSICBRAINZ4_ISWC_LIST_H +#define _MUSICBRAINZ4_ISWC_LIST_H + +#include +#include + +#include "musicbrainz4/ListImpl.h" + +#include "musicbrainz4/xmlParser.h" + +namespace MusicBrainz4 +{ + class CISWC; + class CISWCListPrivate; + + class CISWCList: public CListImpl + { + public: + CISWCList(const XMLNode& Node=XMLNode::emptyNode()); + CISWCList(const CISWCList& Other); + CISWCList& operator =(const CISWCList& Other); + virtual ~CISWCList(); + + virtual CISWCList *Clone(); + + virtual std::ostream& Serialise(std::ostream& os) const; + static std::string GetElementName(); + + protected: + virtual void ParseAttribute(const std::string& Name, const std::string& Value); + virtual void ParseElement(const XMLNode& Node); + + private: + CISWCListPrivate * const m_d; + }; +} + +#endif === modified file 'include/musicbrainz4/Label.h' --- include/musicbrainz4/Label.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/Label.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: Label.h 13265 2011-08-25 12:53:44Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ @@ -29,6 +29,7 @@ #include #include "musicbrainz4/Entity.h" +#include "musicbrainz4/IPIList.h" #include "musicbrainz4/ReleaseList.h" #include "musicbrainz4/AliasList.h" #include "musicbrainz4/RelationList.h" @@ -60,13 +61,39 @@ std::string Name() const; std::string SortName() const; int LabelCode() const; - std::string IPI() const; + + /** + * @deprecated Returns one of the IPIs for this label + * + * Returns one of the IPIs for this label. To return all + * IPIs, see MusicBrainz4::CLabel::IPIList + * + * This method is deprecated, please use MusicBrainz4::CLabel::IPIList + * + * @return One of the IPIs for this label + */ + + LIBMB4_DEPRECATED(MusicBrainz4::CLabel::IPIList) std::string IPI() const; + CIPIList *IPIList() const; std::string Disambiguation() const; std::string Country() const; CLifespan *Lifespan() const; CAliasList *AliasList() const; CReleaseList *ReleaseList() const; - CRelationList *RelationList() const; + + /** + * @deprecated Returns the last relation list for this label + * + * Returns the last relation list for this label. To return all + * relation lists, see MusicBrainz4::CLabel::RelationListList + * + * This method is deprecated, please use MusicBrainz4::CLabel::RelationListList + * + * @return The last relation list for this label + */ + + LIBMB4_DEPRECATED(MusicBrainz4::CLabel::RelationListList) CRelationList *RelationList() const; + CRelationListList *RelationListList() const; CTagList *TagList() const; CUserTagList *UserTagList() const; CRating *Rating() const; @@ -76,8 +103,8 @@ static std::string GetElementName(); protected: - virtual bool ParseAttribute(const std::string& Name, const std::string& Value); - virtual bool ParseElement(const XMLNode& Node); + virtual void ParseAttribute(const std::string& Name, const std::string& Value); + virtual void ParseElement(const XMLNode& Node); private: void Cleanup(); === modified file 'include/musicbrainz4/LabelInfo.h' --- include/musicbrainz4/LabelInfo.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/LabelInfo.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: LabelInfo.h 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ @@ -55,8 +55,8 @@ static std::string GetElementName(); protected: - virtual bool ParseAttribute(const std::string& Name, const std::string& Value); - virtual bool ParseElement(const XMLNode& Node); + virtual void ParseAttribute(const std::string& Name, const std::string& Value); + virtual void ParseElement(const XMLNode& Node); private: void Cleanup(); === modified file 'include/musicbrainz4/LabelInfoList.h' --- include/musicbrainz4/LabelInfoList.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/LabelInfoList.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: LabelInfoList.h 13254 2011-08-09 09:29:20Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ === modified file 'include/musicbrainz4/LabelList.h' --- include/musicbrainz4/LabelList.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/LabelList.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: LabelList.h 13254 2011-08-09 09:29:20Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ === modified file 'include/musicbrainz4/Lifespan.h' --- include/musicbrainz4/Lifespan.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/Lifespan.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: Lifespan.h 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ @@ -48,13 +48,14 @@ std::string Begin() const; std::string End() const; + std::string Ended() const; virtual std::ostream& Serialise(std::ostream& os) const; static std::string GetElementName(); protected: - virtual bool ParseAttribute(const std::string& Name, const std::string& Value); - virtual bool ParseElement(const XMLNode& Node); + virtual void ParseAttribute(const std::string& Name, const std::string& Value); + virtual void ParseElement(const XMLNode& Node); private: CLifespanPrivate * const m_d; === modified file 'include/musicbrainz4/List.h' --- include/musicbrainz4/List.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/List.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: List.h 13254 2011-08-09 09:29:20Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ @@ -51,8 +51,8 @@ static std::string GetElementName(); protected: - virtual bool ParseAttribute(const std::string& Name, const std::string& Value); - virtual bool ParseElement(const XMLNode& Node); + virtual void ParseAttribute(const std::string& Name, const std::string& Value); + virtual void ParseElement(const XMLNode& Node); void AddItem(CEntity *Item); CEntity *Item(int Item) const; === modified file 'include/musicbrainz4/ListImpl.h' --- include/musicbrainz4/ListImpl.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/ListImpl.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: ListImpl.h 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ @@ -101,26 +101,20 @@ } protected: - bool ParseElement(const XMLNode& Node) + void ParseElement(const XMLNode& Node) { - bool RetVal=true; - std::string NodeName=Node.getName(); if (T::GetElementName()==NodeName) { T *Item=0; - RetVal=ProcessItem(Node,Item); - if (RetVal) - AddItem(Item); + ProcessItem(Node,Item); + AddItem(Item); } else - RetVal=CList::ParseElement(Node); - - return RetVal; + CList::ParseElement(Node); } - }; } === modified file 'include/musicbrainz4/Medium.h' --- include/musicbrainz4/Medium.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/Medium.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: Medium.h 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ @@ -60,8 +60,8 @@ static std::string GetElementName(); protected: - virtual bool ParseAttribute(const std::string& Name, const std::string& Value); - virtual bool ParseElement(const XMLNode& Node); + virtual void ParseAttribute(const std::string& Name, const std::string& Value); + virtual void ParseElement(const XMLNode& Node); private: void Cleanup(); === modified file 'include/musicbrainz4/MediumList.h' --- include/musicbrainz4/MediumList.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/MediumList.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: MediumList.h 13254 2011-08-09 09:29:20Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ @@ -53,8 +53,8 @@ static std::string GetElementName(); protected: - virtual bool ParseAttribute(const std::string& Name, const std::string& Value); - virtual bool ParseElement(const XMLNode& Node); + virtual void ParseAttribute(const std::string& Name, const std::string& Value); + virtual void ParseElement(const XMLNode& Node); private: CMediumListPrivate * const m_d; === modified file 'include/musicbrainz4/Message.h' --- include/musicbrainz4/Message.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/Message.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: Message.h 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ @@ -52,8 +52,8 @@ static std::string GetElementName(); protected: - virtual bool ParseAttribute(const std::string& Name, const std::string& Value); - virtual bool ParseElement(const XMLNode& Node); + virtual void ParseAttribute(const std::string& Name, const std::string& Value); + virtual void ParseElement(const XMLNode& Node); private: CMessagePrivate * const m_d; === modified file 'include/musicbrainz4/Metadata.h' --- include/musicbrainz4/Metadata.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/Metadata.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: Metadata.h 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ @@ -112,8 +112,8 @@ static std::string GetElementName(); protected: - virtual bool ParseAttribute(const std::string& Name, const std::string& Value); - virtual bool ParseElement(const XMLNode& Node); + virtual void ParseAttribute(const std::string& Name, const std::string& Value); + virtual void ParseElement(const XMLNode& Node); private: void Cleanup(); === modified file 'include/musicbrainz4/NameCredit.h' --- include/musicbrainz4/NameCredit.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/NameCredit.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: NameCredit.h 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ @@ -56,8 +56,8 @@ static std::string GetElementName(); protected: - virtual bool ParseAttribute(const std::string& Name, const std::string& Value); - virtual bool ParseElement(const XMLNode& Node); + virtual void ParseAttribute(const std::string& Name, const std::string& Value); + virtual void ParseElement(const XMLNode& Node); private: void Cleanup(); === modified file 'include/musicbrainz4/NameCreditList.h' --- include/musicbrainz4/NameCreditList.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/NameCreditList.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: NameCreditList.h 13254 2011-08-09 09:29:20Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ === modified file 'include/musicbrainz4/NonMBTrack.h' --- include/musicbrainz4/NonMBTrack.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/NonMBTrack.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: NonMBTrack.h 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ @@ -54,8 +54,8 @@ static std::string GetElementName(); protected: - virtual bool ParseAttribute(const std::string& Name, const std::string& Value); - virtual bool ParseElement(const XMLNode& Node); + virtual void ParseAttribute(const std::string& Name, const std::string& Value); + virtual void ParseElement(const XMLNode& Node); private: CNonMBTrackPrivate * const m_d; === modified file 'include/musicbrainz4/NonMBTrackList.h' --- include/musicbrainz4/NonMBTrackList.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/NonMBTrackList.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: NonMBTrackList.h 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ === modified file 'include/musicbrainz4/PUID.h' --- include/musicbrainz4/PUID.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/PUID.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: PUID.h 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ @@ -53,8 +53,8 @@ static std::string GetElementName(); protected: - virtual bool ParseAttribute(const std::string& Name, const std::string& Value); - virtual bool ParseElement(const XMLNode& Node); + virtual void ParseAttribute(const std::string& Name, const std::string& Value); + virtual void ParseElement(const XMLNode& Node); private: void Cleanup(); === modified file 'include/musicbrainz4/PUIDList.h' --- include/musicbrainz4/PUIDList.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/PUIDList.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: PUIDList.h 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ === modified file 'include/musicbrainz4/Query.h' --- include/musicbrainz4/Query.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/Query.h 2012-06-25 05:56:21 +0000 @@ -18,13 +18,17 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: Query.h 13266 2011-08-25 12:56:47Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ #ifndef _MUSICBRAINZ4_QUERY_H #define _MUSICBRAINZ4_QUERY_H +#include "defines.h" + +#include "Entity.h" + #include "musicbrainz4/ReleaseList.h" #include "musicbrainz4/Metadata.h" @@ -47,6 +51,23 @@ * Please report any issues with this library at * http://tickets.musicbrainz.org/. * + * @par Compiling and Linking + * + * This package provides a pkg-config script that returns the necessary compiler + * and linker flags, as well as the version number. To build a small sample + * program one would use: + * + * @par + * g++ -o test_app test_app.cpp `pkg-config libmusicbrainz4 --cflags --libs` + * + * If you don't want/can't use pkg-config and you are using the C API, make sure + * you link in the C++ standard library: + * + * @par + * gcc -o test_app test_app.c -lmusicbrainz4 -lm -lstdc++ + * + * @par Example: + * * A brief example showing how to lookup a list of releases matching a disc id * @code === modified file 'include/musicbrainz4/Rating.h' --- include/musicbrainz4/Rating.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/Rating.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: Rating.h 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ @@ -52,8 +52,8 @@ static std::string GetElementName(); protected: - virtual bool ParseAttribute(const std::string& Name, const std::string& Value); - virtual bool ParseElement(const XMLNode& Node); + virtual void ParseAttribute(const std::string& Name, const std::string& Value); + virtual void ParseElement(const XMLNode& Node); private: CRatingPrivate * const m_d; === modified file 'include/musicbrainz4/Recording.h' --- include/musicbrainz4/Recording.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/Recording.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: Recording.h 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ @@ -69,7 +69,20 @@ CReleaseList *ReleaseList() const; CPUIDList *PUIDList() const; CISRCList *ISRCList() const; - CRelationList *RelationList() const; + + /** + * @deprecated Returns the last relation list for this recording + * + * Returns the last relation list for this recording. To return all + * relation lists, see MusicBrainz4::CRecording::RelationListList + * + * This method is deprecated, please use MusicBrainz4::CRecording::RelationListList + * + * @return The last relation list for this recording + */ + + LIBMB4_DEPRECATED(MusicBrainz4::CRecording::RelationListList) CRelationList *RelationList() const; + CRelationListList *RelationListList() const; CTagList *TagList() const; CUserTagList *UserTagList() const; CRating *Rating() const; @@ -79,8 +92,8 @@ static std::string GetElementName(); protected: - virtual bool ParseAttribute(const std::string& Name, const std::string& Value); - virtual bool ParseElement(const XMLNode& Node); + virtual void ParseAttribute(const std::string& Name, const std::string& Value); + virtual void ParseElement(const XMLNode& Node); private: void Cleanup(); === modified file 'include/musicbrainz4/RecordingList.h' --- include/musicbrainz4/RecordingList.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/RecordingList.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: RecordingList.h 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ === modified file 'include/musicbrainz4/Relation.h' --- include/musicbrainz4/Relation.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/Relation.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: Relation.h 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ @@ -71,8 +71,8 @@ static std::string GetElementName(); protected: - virtual bool ParseAttribute(const std::string& Name, const std::string& Value); - virtual bool ParseElement(const XMLNode& Node); + virtual void ParseAttribute(const std::string& Name, const std::string& Value); + virtual void ParseElement(const XMLNode& Node); private: void Cleanup(); === modified file 'include/musicbrainz4/RelationList.h' --- include/musicbrainz4/RelationList.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/RelationList.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: RelationList.h 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ @@ -53,8 +53,8 @@ static std::string GetElementName(); protected: - virtual bool ParseAttribute(const std::string& Name, const std::string& Value); - virtual bool ParseElement(const XMLNode& Node); + virtual void ParseAttribute(const std::string& Name, const std::string& Value); + virtual void ParseElement(const XMLNode& Node); private: CRelationListPrivate * const m_d; === added file 'include/musicbrainz4/RelationListList.h' --- include/musicbrainz4/RelationListList.h 1970-01-01 00:00:00 +0000 +++ include/musicbrainz4/RelationListList.h 2012-06-25 05:56:21 +0000 @@ -0,0 +1,63 @@ +/* -------------------------------------------------------------------------- + + libmusicbrainz4 - Client library to access MusicBrainz + + Copyright (C) 2011 Andrew Hawkins + + This file is part of libmusicbrainz4. + + This library is free software; you can redistribute it and/or + modify it under the terms of v2 of the GNU Lesser General Public + License as published by the Free Software Foundation. + + libmusicbrainz4 is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this library. If not, see . + + $Id$ + +----------------------------------------------------------------------------*/ + +#ifndef _MUSICBRAINZ4_RELATIONLIST_GROUP_H +#define _MUSICBRAINZ4_RELATIONLIST_GROUP_H + +#include + +#include "musicbrainz4/xmlParser.h" + +namespace MusicBrainz4 +{ + class CRelationListListPrivate; + + class CRelationList; + + class CRelationListList + { + public: + CRelationListList(); + CRelationListList(const CRelationListList& Other); + CRelationListList& operator =(const CRelationListList& Other); + virtual ~CRelationListList(); + + void Add(CRelationList *RelationList); + int NumItems() const; + CRelationList *Item(int Item) const; + int Offset() const { return 0; } + int Count() const { return NumItems(); } + + std::ostream& Serialise(std::ostream& os) const; + + private: + void Cleanup(); + + CRelationListListPrivate * const m_d; + }; +} + +std::ostream& operator << (std::ostream& os, const MusicBrainz4::CRelationListList& RelationListList); + +#endif === modified file 'include/musicbrainz4/Release.h' --- include/musicbrainz4/Release.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/Release.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: Release.h 13385 2012-01-15 15:19:56Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ @@ -70,7 +70,20 @@ std::string ASIN() const; CLabelInfoList *LabelInfoList() const; CMediumList *MediumList() const; - CRelationList *RelationList() const; + + /** + * @deprecated Returns the last relation list for this release + * + * Returns the last relation list for this release. To return all + * relation lists, see MusicBrainz4::CRelease::RelationListList + * + * This method is deprecated, please use MusicBrainz4::CRelease::RelationListList + * + * @return The last relation list for this release + */ + + LIBMB4_DEPRECATED(MusicBrainz4::CRelease::RelationListList) CRelationList *RelationList() const; + CRelationListList *RelationListList() const; CCollectionList *CollectionList() const; CMediumList MediaMatchingDiscID(const std::string& DiscID) const; @@ -79,8 +92,8 @@ static std::string GetElementName(); protected: - virtual bool ParseAttribute(const std::string& Name, const std::string& Value); - virtual bool ParseElement(const XMLNode& Node); + virtual void ParseAttribute(const std::string& Name, const std::string& Value); + virtual void ParseElement(const XMLNode& Node); private: void Cleanup(); === modified file 'include/musicbrainz4/ReleaseGroup.h' --- include/musicbrainz4/ReleaseGroup.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/ReleaseGroup.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: ReleaseGroup.h 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ @@ -33,6 +33,7 @@ #include "musicbrainz4/RelationList.h" #include "musicbrainz4/TagList.h" #include "musicbrainz4/UserTagList.h" +#include "musicbrainz4/SecondaryTypeList.h" #include "musicbrainz4/xmlParser.h" @@ -43,6 +44,7 @@ class CArtistCredit; class CRating; class CUserRating; + class CSecondaryType; class CReleaseGroup: public CEntity { @@ -55,24 +57,51 @@ virtual CReleaseGroup *Clone(); std::string ID() const; - std::string Type() const; + + /** + * @deprecated Returns the type for this release group + * + * Returns the type for this release group. + * + * This method is deprecated, please use MusicBrainz4::CReleaseGroup::PrimaryType + * and MusicBrainz4::CReleaseGroup::SecondaryTypeList + * + * @return The type for this release group + */ + + LIBMB4_DEPRECATED(MusicBrainz4::CReleaseGroup::PrimaryType) std::string Type() const; + std::string PrimaryType() const; std::string Title() const; std::string Disambiguation() const; std::string FirstReleaseDate() const; CArtistCredit *ArtistCredit() const; CReleaseList *ReleaseList() const; - CRelationList *RelationList() const; + + /** + * @deprecated Returns the last relation list for this release group + * + * Returns the last relation list for this release group. To return all + * relation lists, see MusicBrainz4::CReleaseGroup::RelationListList + * + * This method is deprecated, please use MusicBrainz4::CReleaseGroup::RelationListList + * + * @return The last relation list for this release group + */ + + LIBMB4_DEPRECATED(MusicBrainz4::CReleaseGroup::RelationListList) CRelationList *RelationList() const; + CRelationListList *RelationListList() const; CTagList *TagList() const; CUserTagList *UserTagList() const; CRating *Rating() const; CUserRating *UserRating() const; + CSecondaryTypeList *SecondaryTypeList() const; virtual std::ostream& Serialise(std::ostream& os) const; static std::string GetElementName(); protected: - virtual bool ParseAttribute(const std::string& Name, const std::string& Value); - virtual bool ParseElement(const XMLNode& Node); + virtual void ParseAttribute(const std::string& Name, const std::string& Value); + virtual void ParseElement(const XMLNode& Node); private: void Cleanup(); === modified file 'include/musicbrainz4/ReleaseGroupList.h' --- include/musicbrainz4/ReleaseGroupList.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/ReleaseGroupList.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: ReleaseGroupList.h 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ === modified file 'include/musicbrainz4/ReleaseList.h' --- include/musicbrainz4/ReleaseList.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/ReleaseList.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: ReleaseList.h 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ === added file 'include/musicbrainz4/SecondaryType.h' --- include/musicbrainz4/SecondaryType.h 1970-01-01 00:00:00 +0000 +++ include/musicbrainz4/SecondaryType.h 2012-06-25 05:56:21 +0000 @@ -0,0 +1,65 @@ +/* -------------------------------------------------------------------------- + + libmusicbrainz4 - Client library to access MusicBrainz + + Copyright (C) 2012 Andrew Hawkins + + This file is part of libmusicbrainz4. + + This library is free software; you can redistribute it and/or + modify it under the terms of v2 of the GNU Lesser General Public + License as published by the Free Software Foundation. + + libmusicbrainz4 is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this library. If not, see . + + $Id$ + +----------------------------------------------------------------------------*/ + +#ifndef _MUSICBRAINZ4_SECONDARY_TYPE_H +#define _MUSICBRAINZ4_SECONDARY_TYPE_H + +#include +#include + +#include "musicbrainz4/Entity.h" + +#include "musicbrainz4/xmlParser.h" + +namespace MusicBrainz4 +{ + class CSecondaryTypePrivate; + + class CSecondaryType: public CEntity + { + public: + CSecondaryType(const XMLNode& Node=XMLNode::emptyNode()); + CSecondaryType(const CSecondaryType& Other); + CSecondaryType& operator =(const CSecondaryType& Other); + virtual ~CSecondaryType(); + + virtual CSecondaryType *Clone(); + + std::string SecondaryType() const; + + virtual std::ostream& Serialise(std::ostream& os) const; + static std::string GetElementName(); + + protected: + virtual void ParseAttribute(const std::string& Name, const std::string& Value); + virtual void ParseElement(const XMLNode& Node); + + private: + void Cleanup(); + + CSecondaryTypePrivate * const m_d; + }; +} + +#endif === added file 'include/musicbrainz4/SecondaryTypeList.h' --- include/musicbrainz4/SecondaryTypeList.h 1970-01-01 00:00:00 +0000 +++ include/musicbrainz4/SecondaryTypeList.h 2012-06-25 05:56:21 +0000 @@ -0,0 +1,62 @@ +/* -------------------------------------------------------------------------- + + libmusicbrainz4 - Client library to access MusicBrainz + + Copyright (C) 2012 Andrew Hawkins + + This file is part of libmusicbrainz4. + + This library is free software; you can redistribute it and/or + modify it under the terms of v2 of the GNU Lesser General Public + License as published by the Free Software Foundation. + + libmusicbrainz4 is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this library. If not, see . + + $Id$ + +----------------------------------------------------------------------------*/ + +#ifndef _MUSICBRAINZ4_SECONDARY_TYPE_LIST_H +#define _MUSICBRAINZ4_SECONDARY_TYPE_LIST_H + +#include +#include + +#include "musicbrainz4/ListImpl.h" + +#include "musicbrainz4/xmlParser.h" + +namespace MusicBrainz4 +{ + class CSecondaryType; + class CSecondaryTypeListPrivate; + + class CSecondaryTypeList: public CListImpl + { + public: + CSecondaryTypeList(const XMLNode& Node=XMLNode::emptyNode()); + CSecondaryTypeList(const CSecondaryTypeList& Other); + CSecondaryTypeList& operator =(const CSecondaryTypeList& Other); + virtual ~CSecondaryTypeList(); + + virtual CSecondaryTypeList *Clone(); + + virtual std::ostream& Serialise(std::ostream& os) const; + static std::string GetElementName(); + + protected: + virtual void ParseAttribute(const std::string& Name, const std::string& Value); + virtual void ParseElement(const XMLNode& Node); + + private: + CSecondaryTypeListPrivate * const m_d; + }; +} + +#endif === modified file 'include/musicbrainz4/Tag.h' --- include/musicbrainz4/Tag.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/Tag.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: Tag.h 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ @@ -53,8 +53,8 @@ static std::string GetElementName(); protected: - virtual bool ParseAttribute(const std::string& Name, const std::string& Value); - virtual bool ParseElement(const XMLNode& Node); + virtual void ParseAttribute(const std::string& Name, const std::string& Value); + virtual void ParseElement(const XMLNode& Node); private: CTagPrivate * const m_d; === modified file 'include/musicbrainz4/TagList.h' --- include/musicbrainz4/TagList.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/TagList.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: TagList.h 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ === modified file 'include/musicbrainz4/TextRepresentation.h' --- include/musicbrainz4/TextRepresentation.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/TextRepresentation.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: TextRepresentation.h 13263 2011-08-25 12:38:04Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ @@ -53,8 +53,8 @@ static std::string GetElementName(); protected: - virtual bool ParseAttribute(const std::string& Name, const std::string& Value); - virtual bool ParseElement(const XMLNode& Node); + virtual void ParseAttribute(const std::string& Name, const std::string& Value); + virtual void ParseElement(const XMLNode& Node); private: CTextRepresentationPrivate * const m_d; === modified file 'include/musicbrainz4/Track.h' --- include/musicbrainz4/Track.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/Track.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: Track.h 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ @@ -54,13 +54,14 @@ CRecording *Recording() const; int Length() const; CArtistCredit *ArtistCredit() const; + std::string Number() const; virtual std::ostream& Serialise(std::ostream& os) const; static std::string GetElementName(); protected: - virtual bool ParseAttribute(const std::string& Name, const std::string& Value); - virtual bool ParseElement(const XMLNode& Node); + virtual void ParseAttribute(const std::string& Name, const std::string& Value); + virtual void ParseElement(const XMLNode& Node); private: void Cleanup(); === modified file 'include/musicbrainz4/TrackList.h' --- include/musicbrainz4/TrackList.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/TrackList.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: TrackList.h 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ === modified file 'include/musicbrainz4/UserRating.h' --- include/musicbrainz4/UserRating.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/UserRating.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: UserRating.h 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ @@ -51,8 +51,8 @@ static std::string GetElementName(); protected: - virtual bool ParseAttribute(const std::string& Name, const std::string& Value); - virtual bool ParseElement(const XMLNode& Node); + virtual void ParseAttribute(const std::string& Name, const std::string& Value); + virtual void ParseElement(const XMLNode& Node); private: CUserRatingPrivate * const m_d; === modified file 'include/musicbrainz4/UserTag.h' --- include/musicbrainz4/UserTag.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/UserTag.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: UserTag.h 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ @@ -52,8 +52,8 @@ static std::string GetElementName(); protected: - virtual bool ParseAttribute(const std::string& Name, const std::string& Value); - virtual bool ParseElement(const XMLNode& Node); + virtual void ParseAttribute(const std::string& Name, const std::string& Value); + virtual void ParseElement(const XMLNode& Node); private: CUserTagPrivate * const m_d; === modified file 'include/musicbrainz4/UserTagList.h' --- include/musicbrainz4/UserTagList.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/UserTagList.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: UserTagList.h 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ === modified file 'include/musicbrainz4/Work.h' --- include/musicbrainz4/Work.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/Work.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: Work.h 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ @@ -32,6 +32,7 @@ #include "musicbrainz4/RelationList.h" #include "musicbrainz4/TagList.h" #include "musicbrainz4/UserTagList.h" +#include "musicbrainz4/ISWCList.h" #include "musicbrainz4/xmlParser.h" @@ -58,21 +59,49 @@ std::string Type() const; std::string Title() const; CArtistCredit *ArtistCredit() const; - std::string ISWC() const; + + /** + * @deprecated Returns the first ISWC for this work + * + * Returns the first ISWC for this work. To return all + * ISWCs, see MusicBrainz4::CWork::ISWCList + * + * This method is deprecated, please use MusicBrainz4::CWork::ISWCList + * + * @return The first ISWC for this work + */ + + LIBMB4_DEPRECATED(MusicBrainz4::CWork::ISWCList) std::string ISWC() const; + + CISWCList *ISWCList() const; std::string Disambiguation() const; CAliasList *AliasList() const; - CRelationList *RelationList() const; + + /** + * @deprecated Returns the last relation list for this work + * + * Returns the last relation list for this work. To return all + * relation lists, see MusicBrainz4::CWork::RelationListList + * + * This method is deprecated, please use MusicBrainz4::CWork::RelationListList + * + * @return The last relation list for this work + */ + + LIBMB4_DEPRECATED(MusicBrainz4::CWork::RelationListList) CRelationList *RelationList() const; + CRelationListList *RelationListList() const; CTagList *TagList() const; CUserTagList *UserTagList() const; CRating *Rating() const; CUserRating *UserRating() const; + std::string Language() const; virtual std::ostream& Serialise(std::ostream& os) const; static std::string GetElementName(); protected: - virtual bool ParseAttribute(const std::string& Name, const std::string& Value); - virtual bool ParseElement(const XMLNode& Node); + virtual void ParseAttribute(const std::string& Name, const std::string& Value); + virtual void ParseElement(const XMLNode& Node); private: void Cleanup(); === modified file 'include/musicbrainz4/WorkList.h' --- include/musicbrainz4/WorkList.h 2012-02-01 17:18:10 +0000 +++ include/musicbrainz4/WorkList.h 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: WorkList.h 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ === added file 'include/musicbrainz4/defines.h' --- include/musicbrainz4/defines.h 1970-01-01 00:00:00 +0000 +++ include/musicbrainz4/defines.h 2012-06-25 05:56:21 +0000 @@ -0,0 +1,42 @@ +/* -------------------------------------------------------------------------- + + libmusicbrainz4 - Client library to access MusicBrainz + + Copyright (C) 2012 Andrew Hawkins + + This file is part of libmusicbrainz4. + + This library is free software; you can redistribute it and/or + modify it under the terms of v2 of the GNU Lesser General Public + License as published by the Free Software Foundation. + + libmusicbrainz4 is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this library. If not, see . + + $Id$ + +----------------------------------------------------------------------------*/ + +#ifndef _DEFINES_H +#define _DEFINES_H + +#if defined(__GNUC__) && __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5) + +#define LIBMB4_DEPRECATED(f) __attribute__((deprecated("Use '" #f "' instead"))) + +#elif defined(__GNUC__) && __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1) + +#define LIBMB4_DEPRECATED(f) __attribute__ ((deprecated)) + +#else + +#define LIBMB4_DEPRECATED(f) + +#endif + +#endif === removed directory 'schema' === removed file 'schema/musicbrainz_mmd-1.0.rng' --- schema/musicbrainz_mmd-1.0.rng 2012-02-01 17:18:10 +0000 +++ schema/musicbrainz_mmd-1.0.rng 1970-01-01 00:00:00 +0000 @@ -1,585 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [A-Z0-9]{10} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [a-zA-Z0-9._]{27}- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [0-9]{4}(-[0-9]{2})?(-[0-9]{2})? - - - - - - - - [A-Z]{2} - - - - - - - - [A-Z]{3} - - - - - - - - [A-Z][a-z]{3} - - - - - - - - [0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12} - - - - - - - - both - forward - backward - - - - === removed file 'schema/musicbrainz_mmd-1.0rc1.rng' --- schema/musicbrainz_mmd-1.0rc1.rng 2012-02-01 17:18:10 +0000 +++ schema/musicbrainz_mmd-1.0rc1.rng 1970-01-01 00:00:00 +0000 @@ -1,478 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [A-Z0-9]{10} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [a-zA-Z0-9._]{27}- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [0-9]{4}(-[0-9]{2})?(-[0-9]{2})? - - - - - - - - [A-Z]{2} - - - - - - - - [A-Z]{3} - - - - - - - - [A-Z][a-z]{3} - - - - - - - - [0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12} - - - - - - - - both - forward - backward - - - - === removed file 'schema/musicbrainz_mmd-1.0rc2.rng' --- schema/musicbrainz_mmd-1.0rc2.rng 2012-02-01 17:18:10 +0000 +++ schema/musicbrainz_mmd-1.0rc2.rng 1970-01-01 00:00:00 +0000 @@ -1,518 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [A-Z0-9]{10} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [a-zA-Z0-9._]{27}- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [0-9]{4}(-[0-9]{2})?(-[0-9]{2})? - - - - - - - - [A-Z]{2} - - - - - - - - [A-Z]{3} - - - - - - - - [A-Z][a-z]{3} - - - - - - - - [0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12} - - - - - - - - both - forward - backward - - - - === removed file 'schema/musicbrainz_mmd-1.0rc3.rng' --- schema/musicbrainz_mmd-1.0rc3.rng 2012-02-01 17:18:10 +0000 +++ schema/musicbrainz_mmd-1.0rc3.rng 1970-01-01 00:00:00 +0000 @@ -1,518 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [A-Z0-9]{10} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [a-zA-Z0-9._]{27}- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [0-9]{4}(-[0-9]{2})?(-[0-9]{2})? - - - - - - - - [A-Z]{2} - - - - - - - - [A-Z]{3} - - - - - - - - [A-Z][a-z]{3} - - - - - - - - [0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12} - - - - - - - - both - forward - backward - - - - === removed file 'schema/musicbrainz_mmd-1.0rc4.rng' --- schema/musicbrainz_mmd-1.0rc4.rng 2012-02-01 17:18:10 +0000 +++ schema/musicbrainz_mmd-1.0rc4.rng 1970-01-01 00:00:00 +0000 @@ -1,539 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [A-Z0-9]{10} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [a-zA-Z0-9._]{27}- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [0-9]{4}(-[0-9]{2})?(-[0-9]{2})? - - - - - - - - [A-Z]{2} - - - - - - - - [A-Z]{3} - - - - - - - - [A-Z][a-z]{3} - - - - - - - - [0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12} - - - - - - - - both - forward - backward - - - - === removed file 'schema/musicbrainz_mmd-1.0rc5.rng' --- schema/musicbrainz_mmd-1.0rc5.rng 2012-02-01 17:18:10 +0000 +++ schema/musicbrainz_mmd-1.0rc5.rng 1970-01-01 00:00:00 +0000 @@ -1,585 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [A-Z0-9]{10} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [a-zA-Z0-9._]{27}- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [0-9]{4}(-[0-9]{2})?(-[0-9]{2})? - - - - - - - - [A-Z]{2} - - - - - - - - [A-Z]{3} - - - - - - - - [A-Z][a-z]{3} - - - - - - - - [0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12} - - - - - - - - both - forward - backward - - - - === removed file 'schema/musicbrainz_mmd-1.1.rng' --- schema/musicbrainz_mmd-1.1.rng 2012-02-01 17:18:10 +0000 +++ schema/musicbrainz_mmd-1.1.rng 1970-01-01 00:00:00 +0000 @@ -1,694 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [A-Z0-9]{10} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [a-zA-Z0-9._]{27}- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [0-9]{4}(-[0-9]{2})?(-[0-9]{2})? - - - - - - - - [A-Z]{2} - - - - - - - - [A-Z]{3} - - - - - - - - [A-Z][a-z]{3} - - - - - - - - [0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12} - - - - - - - - both - forward - backward - - - - === removed file 'schema/musicbrainz_mmd-1.2.rng' --- schema/musicbrainz_mmd-1.2.rng 2012-02-01 17:18:10 +0000 +++ schema/musicbrainz_mmd-1.2.rng 1970-01-01 00:00:00 +0000 @@ -1,736 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [A-Z0-9]{10} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [a-zA-Z0-9._]{27}- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [0-9]{4}(-[0-9]{2})?(-[0-9]{2})? - - - - - - - - [A-Z]{2} - - - - - - - - [A-Z]{3} - - - - - - - - [A-Z][a-z]{3} - - - - - - - - [0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12} - - - - - - - - both - forward - backward - - - - === removed file 'schema/musicbrainz_mmd-1.3.rng' --- schema/musicbrainz_mmd-1.3.rng 2012-02-01 17:18:10 +0000 +++ schema/musicbrainz_mmd-1.3.rng 1970-01-01 00:00:00 +0000 @@ -1,807 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [A-Z0-9]{10} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [a-zA-Z0-9._]{27}- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [0-9]{4}(-[0-9]{2})?(-[0-9]{2})? - - - - - - - - [A-Z]{2} - - - - - - - - [A-Z]{3} - - - - - - - - [A-Z][a-z]{3} - - - - - - - - [0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12} - - - - - - - - both - forward - backward - - - - === removed file 'schema/musicbrainz_mmd-1.4.rng' --- schema/musicbrainz_mmd-1.4.rng 2012-02-01 17:18:10 +0000 +++ schema/musicbrainz_mmd-1.4.rng 1970-01-01 00:00:00 +0000 @@ -1,911 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [A-Z0-9]{10} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [a-zA-Z0-9._]{27}- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [0-9]{4}(-[0-9]{2})?(-[0-9]{2})? - - - - - - - - [A-Z]{2} - - - - - - - - [A-Z]{3} - - - - - - - - [A-Z][a-z]{3} - - - - - - - [A-Z]{2}[A-Z0-9]{3}[0-9]{2}[0-9]{5} - - - - - - - - [0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12} - - - - - - - - both - forward - backward - - - - === removed file 'schema/musicbrainz_mmd-2.0.rng' --- schema/musicbrainz_mmd-2.0.rng 2012-02-01 17:18:10 +0000 +++ schema/musicbrainz_mmd-2.0.rng 1970-01-01 00:00:00 +0000 @@ -1,1537 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [A-Z0-9]{10} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [a-zA-Z0-9._]{27}- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [a-zA-Z0-9._]{27}- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [a-zA-Z0-9]{8} - - - - - - - - - - - - - - - - - - - - - [0-9]{4} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [0-9]{4}(-[0-9]{2})?(-[0-9]{2})? - - - - - - - [0-9]{11} - - - - - - - - [A-Z]{2} - - - - - - - [A-Z]{2}\-[A-Z]{2} - - - - - - - - [a-z]{3} - - - - - - - - [A-Z][a-z]{3} - - - - - - - [A-Z]{2}[A-Z0-9]{3}[0-9]{2}[0-9]{5} - - - - - - - [A-Z]-[0-9]{3}\.[0-9]{3}\.[0-9]{3}-[0-9] - - - - - - - [0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12} - - - - - - - - both - forward - backward - - - - - - - low - normal - high - - - - === added file 'src/.gitignore' --- src/.gitignore 1970-01-01 00:00:00 +0000 +++ src/.gitignore 2012-06-25 05:56:21 +0000 @@ -0,0 +1,7 @@ +CMakeFiles/ +Makefile +cmake_install.cmake +libmusicbrainz4.so* +make-c-interface +mb4_c.cc +mb4_c.h === modified file 'src/Alias.cc' --- src/Alias.cc 2012-02-01 17:18:10 +0000 +++ src/Alias.cc 2012-06-25 05:56:21 +0000 @@ -18,10 +18,13 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: Alias.cc 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ +#include "config.h" +#include "musicbrainz4/defines.h" + #include "musicbrainz4/Alias.h" class MusicBrainz4::CAliasPrivate @@ -29,6 +32,11 @@ public: std::string m_Locale; std::string m_Text; + std::string m_SortName; + std::string m_Type; + std::string m_Primary; + std::string m_BeginDate; + std::string m_EndDate; }; MusicBrainz4::CAlias::CAlias(const XMLNode& Node) @@ -61,6 +69,11 @@ m_d->m_Locale=Other.m_d->m_Locale; m_d->m_Text=Other.m_d->m_Text; + m_d->m_SortName=Other.m_d->m_SortName; + m_d->m_Type=Other.m_d->m_Type; + m_d->m_Primary=Other.m_d->m_Primary; + m_d->m_BeginDate=Other.m_d->m_BeginDate; + m_d->m_EndDate=Other.m_d->m_EndDate; } return *this; @@ -76,31 +89,30 @@ return new CAlias(*this); } -bool MusicBrainz4::CAlias::ParseAttribute(const std::string& Name, const std::string& Value) +void MusicBrainz4::CAlias::ParseAttribute(const std::string& Name, const std::string& Value) { - bool RetVal=true; - if ("locale"==Name) m_d->m_Locale=Value; + else if ("sort-name"==Name) + m_d->m_SortName=Value; + else if ("type"==Name) + m_d->m_Type=Value; + else if ("primary"==Name) + m_d->m_Primary=Value; + else if ("begin-date"==Name) + m_d->m_BeginDate=Value; + else if ("end-date"==Name) + m_d->m_EndDate=Value; else { std::cerr << "Unrecognised alias attribute: '" << Name << "'" << std::endl; - RetVal=false; } - - return RetVal; - } -bool MusicBrainz4::CAlias::ParseElement(const XMLNode& Node) +void MusicBrainz4::CAlias::ParseElement(const XMLNode& Node) { - bool RetVal=true; - std::string NodeName=Node.getName(); std::cerr << "Unrecognised alias element: '" << NodeName << std::endl; - RetVal=false; - - return RetVal; } std::string MusicBrainz4::CAlias::GetElementName() @@ -118,14 +130,44 @@ return m_d->m_Text; } +std::string MusicBrainz4::CAlias::SortName() const +{ + return m_d->m_SortName; +} + +std::string MusicBrainz4::CAlias::Type() const +{ + return m_d->m_Type; +} + +std::string MusicBrainz4::CAlias::Primary() const +{ + return m_d->m_Primary; +} + +std::string MusicBrainz4::CAlias::BeginDate() const +{ + return m_d->m_BeginDate; +} + +std::string MusicBrainz4::CAlias::EndDate() const +{ + return m_d->m_EndDate; +} + std::ostream& MusicBrainz4::CAlias::Serialise(std::ostream& os) const { os << "Alias:" << std::endl; CEntity::Serialise(os); - os << "\tLocale: " << Locale() << std::endl; - os << "\tText: " << Text() << std::endl; + os << "\tLocale: " << Locale() << std::endl; + os << "\tText: " << Text() << std::endl; + os << "\tSort Name: " << SortName() << std::endl; + os << "\tType: " << Type() << std::endl; + os << "\tPrimary: " << Primary() << std::endl; + os << "\tBeginDate: " << BeginDate() << std::endl; + os << "\tEndDate: " << EndDate() << std::endl; return os; } === modified file 'src/Annotation.cc' --- src/Annotation.cc 2012-02-01 17:18:10 +0000 +++ src/Annotation.cc 2012-06-25 05:56:21 +0000 @@ -18,10 +18,13 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: Annotation.cc 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ +#include "config.h" +#include "musicbrainz4/defines.h" + #include "musicbrainz4/Annotation.h" class MusicBrainz4::CAnnotationPrivate @@ -77,46 +80,36 @@ return new CAnnotation(*this); } -bool MusicBrainz4::CAnnotation::ParseAttribute(const std::string& Name, const std::string& Value) +void MusicBrainz4::CAnnotation::ParseAttribute(const std::string& Name, const std::string& Value) { - bool RetVal=true; - if ("type"==Name) m_d->m_Type=Value; else { std::cerr << "Unrecognised annotation attribute: '" << Name << "'" << std::endl; - RetVal=false; } - - return RetVal; } -bool MusicBrainz4::CAnnotation::ParseElement(const XMLNode& Node) +void MusicBrainz4::CAnnotation::ParseElement(const XMLNode& Node) { - bool RetVal=true; - std::string NodeName=Node.getName(); if ("entity"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Entity); + ProcessItem(Node,m_d->m_Entity); } else if ("name"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Name); + ProcessItem(Node,m_d->m_Name); } else if ("text"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Text); + ProcessItem(Node,m_d->m_Text); } else { std::cerr << "Unrecognised annotation element: '" << NodeName << "'" << std::endl; - RetVal=false; } - - return RetVal; } std::string MusicBrainz4::CAnnotation::GetElementName() === modified file 'src/Artist.cc' --- src/Artist.cc 2012-02-01 17:18:10 +0000 +++ src/Artist.cc 2012-06-25 05:56:21 +0000 @@ -18,13 +18,17 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: Artist.cc 13265 2011-08-25 12:53:44Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ +#include "config.h" +#include "musicbrainz4/defines.h" + #include "musicbrainz4/Artist.h" #include "musicbrainz4/Lifespan.h" +#include "musicbrainz4/IPI.h" #include "musicbrainz4/Rating.h" #include "musicbrainz4/UserRating.h" #include "musicbrainz4/AliasList.h" @@ -40,6 +44,7 @@ #include "musicbrainz4/WorkList.h" #include "musicbrainz4/Work.h" #include "musicbrainz4/RelationList.h" +#include "musicbrainz4/RelationListList.h" #include "musicbrainz4/Relation.h" #include "musicbrainz4/TagList.h" #include "musicbrainz4/Tag.h" @@ -50,14 +55,15 @@ { public: CArtistPrivate() - : m_Lifespan(0), + : m_IPIList(0), + m_Lifespan(0), m_AliasList(0), m_RecordingList(0), m_ReleaseList(0), m_ReleaseGroupList(0), m_LabelList(0), m_WorkList(0), - m_RelationList(0), + m_RelationListList(0), m_TagList(0), m_UserTagList(0), m_Rating(0), @@ -73,6 +79,7 @@ std::string m_Country; std::string m_Disambiguation; std::string m_IPI; + CIPIList *m_IPIList; CLifespan *m_Lifespan; CAliasList *m_AliasList; CRecordingList *m_RecordingList; @@ -80,7 +87,7 @@ CReleaseGroupList *m_ReleaseGroupList; CLabelList *m_LabelList; CWorkList *m_WorkList; - CRelationList *m_RelationList; + CRelationListList *m_RelationListList; CTagList *m_TagList; CUserTagList *m_UserTagList; CRating *m_Rating; @@ -123,6 +130,9 @@ m_d->m_Disambiguation=Other.m_d->m_Disambiguation; m_d->m_IPI=Other.m_d->m_IPI; + if (Other.m_d->m_IPIList) + m_d->m_IPIList=new CIPIList(*Other.m_d->m_IPIList); + if (Other.m_d->m_Lifespan) m_d->m_Lifespan=new CLifespan(*Other.m_d->m_Lifespan); @@ -144,8 +154,8 @@ if (Other.m_d->m_WorkList) m_d->m_WorkList=new CWorkList(*Other.m_d->m_WorkList); - if (Other.m_d->m_RelationList) - m_d->m_RelationList=new CRelationList(*Other.m_d->m_RelationList); + if (Other.m_d->m_RelationListList) + m_d->m_RelationListList=new CRelationListList(*Other.m_d->m_RelationListList); if (Other.m_d->m_TagList) m_d->m_TagList=new CTagList(*Other.m_d->m_TagList); @@ -172,6 +182,9 @@ void MusicBrainz4::CArtist::Cleanup() { + delete m_d->m_IPIList; + m_d->m_IPIList=0; + delete m_d->m_Lifespan; m_d->m_Lifespan=0; @@ -193,8 +206,8 @@ delete m_d->m_WorkList; m_d->m_WorkList=0; - delete m_d->m_RelationList; - m_d->m_RelationList=0; + delete m_d->m_RelationListList; + m_d->m_RelationListList=0; delete m_d->m_TagList; m_d->m_TagList=0; @@ -214,10 +227,8 @@ return new CArtist(*this); } -bool MusicBrainz4::CArtist::ParseAttribute(const std::string& Name, const std::string& Value) +void MusicBrainz4::CArtist::ParseAttribute(const std::string& Name, const std::string& Value) { - bool RetVal=true; - if ("id"==Name) m_d->m_ID=Value; else if ("type"==Name) @@ -226,95 +237,92 @@ { std::cerr << "Unrecognised artist attribute: '" << Name << "'" << std::endl; } - - return RetVal; } -bool MusicBrainz4::CArtist::ParseElement(const XMLNode& Node) +void MusicBrainz4::CArtist::ParseElement(const XMLNode& Node) { - bool RetVal=true; - std::string NodeName=Node.getName(); if ("name"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Name); + ProcessItem(Node,m_d->m_Name); } else if ("sort-name"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_SortName); + ProcessItem(Node,m_d->m_SortName); } else if ("gender"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Gender); + ProcessItem(Node,m_d->m_Gender); } else if ("country"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Country); + ProcessItem(Node,m_d->m_Country); } else if ("disambiguation"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Disambiguation); + ProcessItem(Node,m_d->m_Disambiguation); } else if ("ipi"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_IPI); + ProcessItem(Node,m_d->m_IPI); + } + else if ("ipi-list"==NodeName) + { + ProcessItem(Node,m_d->m_IPIList); } else if ("life-span"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Lifespan); + ProcessItem(Node,m_d->m_Lifespan); } else if ("alias-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_AliasList); + ProcessItem(Node,m_d->m_AliasList); } else if ("recording-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_RecordingList); + ProcessItem(Node,m_d->m_RecordingList); } else if ("release-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_ReleaseList); + ProcessItem(Node,m_d->m_ReleaseList); } else if ("release-group-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_ReleaseGroupList); + ProcessItem(Node,m_d->m_ReleaseGroupList); } else if ("label-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_LabelList); + ProcessItem(Node,m_d->m_LabelList); } else if ("work-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_WorkList); + ProcessItem(Node,m_d->m_WorkList); } else if ("relation-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_RelationList); + ProcessRelationList(Node,m_d->m_RelationListList); } else if ("tag-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_TagList); + ProcessItem(Node,m_d->m_TagList); } else if ("user-tag-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_UserTagList); + ProcessItem(Node,m_d->m_UserTagList); } else if ("rating"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Rating); + ProcessItem(Node,m_d->m_Rating); } else if ("user-rating"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_UserRating); + ProcessItem(Node,m_d->m_UserRating); } else { std::cerr << "Unrecognised artist element: '" << NodeName << "'" << std::endl; - RetVal=false; } - - return RetVal; } std::string MusicBrainz4::CArtist::GetElementName() @@ -362,6 +370,11 @@ return m_d->m_IPI; } +MusicBrainz4::CIPIList *MusicBrainz4::CArtist::IPIList() const +{ + return m_d->m_IPIList; +} + MusicBrainz4::CLifespan *MusicBrainz4::CArtist::Lifespan() const { return m_d->m_Lifespan; @@ -399,7 +412,12 @@ MusicBrainz4::CRelationList *MusicBrainz4::CArtist::RelationList() const { - return m_d->m_RelationList; + return m_d->m_RelationListList?m_d->m_RelationListList->Item(m_d->m_RelationListList->NumItems()-1):0; +} + +MusicBrainz4::CRelationListList *MusicBrainz4::CArtist::RelationListList() const +{ + return m_d->m_RelationListList; } MusicBrainz4::CTagList *MusicBrainz4::CArtist::TagList() const @@ -435,7 +453,9 @@ os << "\tGender: " << Gender() << std::endl; os << "\tCountry: " << Country() << std::endl; os << "\tDisambiguation: " << Disambiguation() << std::endl; - os << "\tIPI: " << IPI() << std::endl; + + if (IPIList()) + os << *IPIList() << std::endl; if (Lifespan()) os << *Lifespan() << std::endl; @@ -458,8 +478,8 @@ if (WorkList()) os << *WorkList() << std::endl; - if (RelationList()) - os << *RelationList() << std::endl; + if (RelationListList()) + os << *RelationListList() << std::endl; if (TagList()) os << *TagList() << std::endl; === modified file 'src/ArtistCredit.cc' --- src/ArtistCredit.cc 2012-02-01 17:18:10 +0000 +++ src/ArtistCredit.cc 2012-06-25 05:56:21 +0000 @@ -18,10 +18,13 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: ArtistCredit.cc 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ +#include "config.h" +#include "musicbrainz4/defines.h" + #include "musicbrainz4/ArtistCredit.h" #include "musicbrainz4/NameCreditList.h" @@ -92,21 +95,13 @@ return new CArtistCredit(*this); } -bool MusicBrainz4::CArtistCredit::ParseAttribute(const std::string& Name, const std::string& /*Value*/) +void MusicBrainz4::CArtistCredit::ParseAttribute(const std::string& Name, const std::string& /*Value*/) { - bool RetVal=true; - std::cerr << "Unrecognised artistcredit attribute: '" << Name << "'" << std::endl; - RetVal=false; - - - return RetVal; } -bool MusicBrainz4::CArtistCredit::ParseElement(const XMLNode& Node) +void MusicBrainz4::CArtistCredit::ParseElement(const XMLNode& Node) { - bool RetVal=true; - std::string NodeName=Node.getName(); if ("name-credit"==NodeName) @@ -117,10 +112,7 @@ else { std::cerr << "Unrecognised artistcredit element: '" << NodeName << "'" << std::endl; - RetVal=false; } - - return RetVal; } std::string MusicBrainz4::CArtistCredit::GetElementName() === modified file 'src/Attribute.cc' --- src/Attribute.cc 2012-02-01 17:18:10 +0000 +++ src/Attribute.cc 2012-06-25 05:56:21 +0000 @@ -18,10 +18,13 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: Attribute.cc 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ +#include "config.h" +#include "musicbrainz4/defines.h" + #include "musicbrainz4/Attribute.h" class MusicBrainz4::CAttributePrivate @@ -74,26 +77,16 @@ return new CAttribute(*this); } -bool MusicBrainz4::CAttribute::ParseAttribute(const std::string& Name, const std::string& /*Value*/) +void MusicBrainz4::CAttribute::ParseAttribute(const std::string& Name, const std::string& /*Value*/) { - bool RetVal=true; - std::cerr << "Unrecognised attribute attribute: '" << Name << "'" << std::endl; - RetVal=false; - - return RetVal; } -bool MusicBrainz4::CAttribute::ParseElement(const XMLNode& Node) +void MusicBrainz4::CAttribute::ParseElement(const XMLNode& Node) { - bool RetVal=true; - std::string NodeName=Node.getName(); std::cerr << "Unrecognised attribute element: '" << NodeName << "'" << std::endl; - RetVal=false; - - return RetVal; } std::string MusicBrainz4::CAttribute::GetElementName() === modified file 'src/CDStub.cc' --- src/CDStub.cc 2012-02-01 17:18:10 +0000 +++ src/CDStub.cc 2012-06-25 05:56:21 +0000 @@ -18,10 +18,13 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: CDStub.cc 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ +#include "config.h" +#include "musicbrainz4/defines.h" + #include "musicbrainz4/CDStub.h" #include "musicbrainz4/NonMBTrackList.h" @@ -101,54 +104,44 @@ return new CCDStub(*this); } -bool MusicBrainz4::CCDStub::ParseAttribute(const std::string& Name, const std::string& Value) +void MusicBrainz4::CCDStub::ParseAttribute(const std::string& Name, const std::string& Value) { - bool RetVal=true; - if ("id"==Name) m_d->m_ID=Value; else { std::cerr << "Unrecognised cdstub attribute: '" << Name << "'" << std::endl; - RetVal=false; } - - return RetVal; } -bool MusicBrainz4::CCDStub::ParseElement(const XMLNode& Node) +void MusicBrainz4::CCDStub::ParseElement(const XMLNode& Node) { - bool RetVal=true; - std::string NodeName=Node.getName(); if ("title"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Title); + ProcessItem(Node,m_d->m_Title); } else if ("artist"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Artist); + ProcessItem(Node,m_d->m_Artist); } else if ("barcode"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Barcode); + ProcessItem(Node,m_d->m_Barcode); } else if ("comment"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Comment); + ProcessItem(Node,m_d->m_Comment); } else if ("track-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_NonMBTrackList); + ProcessItem(Node,m_d->m_NonMBTrackList); } else { std::cerr << "Unrecognised cd stub element: '" << NodeName << "'" << std::endl; - RetVal=false; } - - return RetVal; } std::string MusicBrainz4::CCDStub::GetElementName() === modified file 'src/CMakeLists.txt' --- src/CMakeLists.txt 2012-02-01 17:18:10 +0000 +++ src/CMakeLists.txt 2012-06-25 05:56:21 +0000 @@ -5,7 +5,8 @@ Disc.cc Entity.cc FreeDBDisc.cc HTTPFetch.cc ISRC.cc Label.cc LabelInfo.cc Lifespan.cc List.cc mb4_c.cc Medium.cc MediumList.cc Message.cc Metadata.cc NameCredit.cc NonMBTrack.cc PUID.cc Query.cc Rating.cc Recording.cc Relation.cc RelationList.cc Release.cc ReleaseGroup.cc Tag.cc - TextRepresentation.cc Track.cc UserRating.cc UserTag.cc Work.cc xmlParser.cpp) + TextRepresentation.cc Track.cc UserRating.cc UserTag.cc Work.cc xmlParser.cpp + RelationListList.cc ISWCList.cc ISWC.cc SecondaryType.cc SecondaryTypeList.cc IPI.cc) ADD_EXECUTABLE(make-c-interface make-c-interface.cc xmlParser.cpp) @@ -30,7 +31,9 @@ SET_TARGET_PROPERTIES(musicbrainz4 PROPERTIES DEFINE_SYMBOL _MB4_DEBUG_ ) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -ggdb -O0") + IF(CMAKE_COMPILER_IS_GNUCXX) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -ggdb -O0") + ENDIF(CMAKE_COMPILER_IS_GNUCXX) endif(CMAKE_BUILD_TYPE STREQUAL Debug) TARGET_LINK_LIBRARIES(musicbrainz4 ${NEON_LIBRARIES}) @@ -40,7 +43,11 @@ ENDIF(WIN32) IF(CMAKE_COMPILER_IS_GNUCXX) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -Wextra -pedantic-errors") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic-errors") + IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../.git) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") + ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../.git) + set_source_files_properties(mb4_c.cc PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations") ENDIF(CMAKE_COMPILER_IS_GNUCXX) INSTALL(TARGETS musicbrainz4 DESTINATION ${LIB_INSTALL_DIR}) === modified file 'src/Collection.cc' --- src/Collection.cc 2012-02-01 17:18:10 +0000 +++ src/Collection.cc 2012-06-25 05:56:21 +0000 @@ -18,10 +18,13 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: Collection.cc 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ +#include "config.h" +#include "musicbrainz4/defines.h" + #include "musicbrainz4/Collection.h" #include "musicbrainz4/ReleaseList.h" @@ -96,45 +99,36 @@ return new CCollection(*this); } -bool MusicBrainz4::CCollection::ParseAttribute(const std::string& Name, const std::string& Value) +void MusicBrainz4::CCollection::ParseAttribute(const std::string& Name, const std::string& Value) { - bool RetVal=true; - if ("id"==Name) m_d->m_ID=Value; else { std::cerr << "Unrecognised collection attribute: '" << Name << "'" << std::endl; - RetVal=false; } - - return RetVal; } -bool MusicBrainz4::CCollection::ParseElement(const XMLNode& Node) +void MusicBrainz4::CCollection::ParseElement(const XMLNode& Node) { - bool RetVal=true; - std::string NodeName=Node.getName(); if ("name"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Name); + ProcessItem(Node,m_d->m_Name); } else if ("editor"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Editor); + ProcessItem(Node,m_d->m_Editor); } else if ("release-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_ReleaseList); + ProcessItem(Node,m_d->m_ReleaseList); } else { std::cerr << "Unrecognised collection element: '" << NodeName << "'" << std::endl; - RetVal=false; } - return RetVal; } std::string MusicBrainz4::CCollection::GetElementName() === modified file 'src/Disc.cc' --- src/Disc.cc 2012-02-01 17:18:10 +0000 +++ src/Disc.cc 2012-06-25 05:56:21 +0000 @@ -18,10 +18,13 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: Disc.cc 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ +#include "config.h" +#include "musicbrainz4/defines.h" + #include "musicbrainz4/Disc.h" #include "musicbrainz4/ReleaseList.h" @@ -96,42 +99,32 @@ return new CDisc(*this); } -bool MusicBrainz4::CDisc::ParseAttribute(const std::string& Name, const std::string& Value) +void MusicBrainz4::CDisc::ParseAttribute(const std::string& Name, const std::string& Value) { - bool RetVal=true; - if ("id"==Name) - RetVal=ProcessItem(Value,m_d->m_ID); + ProcessItem(Value,m_d->m_ID); else { std::cerr << "Unrecognised disc attribute: '" << Name << "'" << std::endl; - RetVal=false; } - - return RetVal; } -bool MusicBrainz4::CDisc::ParseElement(const XMLNode& Node) +void MusicBrainz4::CDisc::ParseElement(const XMLNode& Node) { - bool RetVal=true; - std::string NodeName=Node.getName(); if ("sectors"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Sectors); + ProcessItem(Node,m_d->m_Sectors); } else if ("release-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_ReleaseList); + ProcessItem(Node,m_d->m_ReleaseList); } else { std::cerr << "Unrecognised disc element: '" << NodeName << "'" << std::endl; - RetVal=false; } - - return RetVal; } std::string MusicBrainz4::CDisc::GetElementName() === modified file 'src/Entity.cc' --- src/Entity.cc 2012-02-01 17:18:10 +0000 +++ src/Entity.cc 2012-06-25 05:56:21 +0000 @@ -18,12 +18,18 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: Entity.cc 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ +#include "config.h" +#include "musicbrainz4/defines.h" + #include "musicbrainz4/Entity.h" +#include "musicbrainz4/RelationList.h" +#include "musicbrainz4/RelationListList.h" + class MusicBrainz4::CEntityPrivate { public: @@ -70,10 +76,8 @@ { } -bool MusicBrainz4::CEntity::Parse(const XMLNode& Node) +void MusicBrainz4::CEntity::Parse(const XMLNode& Node) { - bool RetVal=true; - if (!Node.isEmpty()) { for (int count=0;countm_ExtAttributes[Name.substr(4)]=Value; - } else - RetVal=RetVal && ParseAttribute(Name,Value); + ParseAttribute(Name,Value); } //std::cout << "Node: " << std::endl << Node.createXMLString(true) << std::endl; @@ -101,15 +103,11 @@ Value=ChildNode.getText(); if ("ext:"==Name.substr(0,4)) - { m_d->m_ExtElements[Name.substr(4)]=Value; - } else - RetVal=RetVal && ParseElement(ChildNode); + ParseElement(ChildNode); } } - - return RetVal; } std::map MusicBrainz4::CEntity::ExtAttributes() const @@ -122,11 +120,22 @@ return m_d->m_ExtElements; } +void MusicBrainz4::CEntity::ProcessRelationList(const XMLNode& Node, CRelationListList* & RetVal) +{ + if (0==RetVal) + RetVal=new CRelationListList; + + CRelationList *RelationList=0; + ProcessItem(Node,RelationList); + RetVal->Add(RelationList); + delete RelationList; +} + std::ostream& MusicBrainz4::CEntity::Serialise(std::ostream& os) const { if (!ExtAttributes().empty()) { - std::cout << "Ext attrs: " << std::endl; + os << "Ext attrs: " << std::endl; std::map ExtAttrs=ExtAttributes(); std::map::const_iterator ThisExtAttr=ExtAttrs.begin(); while (ThisExtAttr!=ExtAttrs.end()) @@ -139,7 +148,7 @@ if (!ExtElements().empty()) { - std::cout << "Ext elements: " << std::endl; + os << "Ext elements: " << std::endl; std::map ExtElems=ExtElements(); std::map::const_iterator ThisExtElement=ExtElems.begin(); while (ThisExtElement!=ExtElems.end()) === modified file 'src/FreeDBDisc.cc' --- src/FreeDBDisc.cc 2012-02-01 17:18:10 +0000 +++ src/FreeDBDisc.cc 2012-06-25 05:56:21 +0000 @@ -18,10 +18,13 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: FreeDBDisc.cc 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ +#include "config.h" +#include "musicbrainz4/defines.h" + #include "musicbrainz4/FreeDBDisc.h" #include "musicbrainz4/NonMBTrackList.h" @@ -101,55 +104,44 @@ return new CFreeDBDisc(*this); } -bool MusicBrainz4::CFreeDBDisc::ParseAttribute(const std::string& Name, const std::string& Value) +void MusicBrainz4::CFreeDBDisc::ParseAttribute(const std::string& Name, const std::string& Value) { - bool RetVal=true; - - if ("id"==Name) m_d->m_ID=Value; else { std::cerr << "Unrecognised freedb disc attribute: '" << Name << "'" << std::endl; - RetVal=false; } - - return RetVal; } -bool MusicBrainz4::CFreeDBDisc::ParseElement(const XMLNode& Node) +void MusicBrainz4::CFreeDBDisc::ParseElement(const XMLNode& Node) { - bool RetVal=true; - std::string NodeName=Node.getName(); if ("title"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Title); + ProcessItem(Node,m_d->m_Title); } else if ("artist"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Artist); + ProcessItem(Node,m_d->m_Artist); } else if ("category"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Category); + ProcessItem(Node,m_d->m_Category); } else if ("year"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Year); + ProcessItem(Node,m_d->m_Year); } else if ("nonmb-track-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_NonMBTrackList); + ProcessItem(Node,m_d->m_NonMBTrackList); } else { std::cerr << "Unrecognised freedb disc element: '" << NodeName << "'" << std::endl; - RetVal=false; } - - return RetVal; } std::string MusicBrainz4::CFreeDBDisc::GetElementName() === modified file 'src/HTTPFetch.cc' --- src/HTTPFetch.cc 2012-02-01 17:18:10 +0000 +++ src/HTTPFetch.cc 2012-06-25 05:56:21 +0000 @@ -18,10 +18,13 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: HTTPFetch.cc 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ +#include "config.h" +#include "musicbrainz4/defines.h" + #include "musicbrainz4/HTTPFetch.h" #include === added file 'src/IPI.cc' --- src/IPI.cc 1970-01-01 00:00:00 +0000 +++ src/IPI.cc 2012-06-25 05:56:21 +0000 @@ -0,0 +1,118 @@ +/* -------------------------------------------------------------------------- + + libmusicbrainz4 - Client library to access MusicBrainz + + Copyright (C) 2012 Andrew Hawkins + + This file is part of libmusicbrainz4. + + This library is free software; you can redistribute it and/or + modify it under the terms of v2 of the GNU Lesser General Public + License as published by the Free Software Foundation. + + libmusicbrainz4 is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this library. If not, see . + + $Id$ + +----------------------------------------------------------------------------*/ + +#include "config.h" +#include "musicbrainz4/defines.h" + +#include "musicbrainz4/IPI.h" + +class MusicBrainz4::CIPIPrivate +{ + public: + CIPIPrivate() + { + } + + std::string m_IPI; +}; + +MusicBrainz4::CIPI::CIPI(const XMLNode& Node) +: CEntity(), + m_d(new CIPIPrivate) +{ + if (!Node.isEmpty()) + { + //std::cout << "IPI node: " << std::endl << Node.createXMLString(true) << std::endl; + + Parse(Node); + + if (Node.getText()) + { + ProcessItem(Node,m_d->m_IPI); + } + } +} + +MusicBrainz4::CIPI::CIPI(const CIPI& Other) +: CEntity(), + m_d(new CIPIPrivate) +{ + *this=Other; +} + +MusicBrainz4::CIPI& MusicBrainz4::CIPI::operator =(const CIPI& Other) +{ + if (this!=&Other) + { + CEntity::operator =(Other); + + m_d->m_IPI=Other.m_d->m_IPI; + } + + return *this; +} + +MusicBrainz4::CIPI::~CIPI() +{ + delete m_d; +} + +MusicBrainz4::CIPI *MusicBrainz4::CIPI::Clone() +{ + return new CIPI(*this); +} + +void MusicBrainz4::CIPI::ParseAttribute(const std::string& Name, const std::string& /*Value*/) +{ + std::cerr << "Unrecognised IPI attribute: '" << Name << "'" << std::endl; +} + +void MusicBrainz4::CIPI::ParseElement(const XMLNode& Node) +{ + std::string Name=Node.getName(); + + std::cerr << "Unrecognised IPI element: '" << Name << "'" << std::endl; +} + +std::string MusicBrainz4::CIPI::GetElementName() +{ + return "ipi"; +} + +std::string MusicBrainz4::CIPI::IPI() const +{ + return m_d->m_IPI; +} + +std::ostream& MusicBrainz4::CIPI::Serialise(std::ostream& os) const +{ + os << "IPI:" << std::endl; + + CEntity::Serialise(os); + + os << "\tIPI: " << IPI() << std::endl; + + return os; +} + === modified file 'src/ISRC.cc' --- src/ISRC.cc 2012-02-01 17:18:10 +0000 +++ src/ISRC.cc 2012-06-25 05:56:21 +0000 @@ -18,10 +18,13 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: ISRC.cc 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ +#include "config.h" +#include "musicbrainz4/defines.h" + #include "musicbrainz4/ISRC.h" #include "musicbrainz4/RecordingList.h" @@ -93,38 +96,28 @@ return new CISRC(*this); } -bool MusicBrainz4::CISRC::ParseAttribute(const std::string& Name, const std::string& Value) +void MusicBrainz4::CISRC::ParseAttribute(const std::string& Name, const std::string& Value) { - bool RetVal=true; - if ("id"==Name) m_d->m_ID=Value; else { std::cerr << "Unrecognised isrc attribute: '" << Name << "'" << std::endl; - RetVal=false; } - - return RetVal; } -bool MusicBrainz4::CISRC::ParseElement(const XMLNode& Node) +void MusicBrainz4::CISRC::ParseElement(const XMLNode& Node) { - bool RetVal=true; - std::string NodeName=Node.getName(); if ("recording-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_RecordingList); + ProcessItem(Node,m_d->m_RecordingList); } else { std::cerr << "Unrecognised ISRC element: '" << NodeName << "'" << std::endl; - RetVal=false; } - - return RetVal; } std::string MusicBrainz4::CISRC::GetElementName() === added file 'src/ISWC.cc' --- src/ISWC.cc 1970-01-01 00:00:00 +0000 +++ src/ISWC.cc 2012-06-25 05:56:21 +0000 @@ -0,0 +1,123 @@ +/* -------------------------------------------------------------------------- + + libmusicbrainz4 - Client library to access MusicBrainz + + Copyright (C) 2012 Andrew Hawkins + + This file is part of libmusicbrainz4. + + This library is free software; you can redistribute it and/or + modify it under the terms of v2 of the GNU Lesser General Public + License as published by the Free Software Foundation. + + libmusicbrainz4 is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this library. If not, see . + + $Id$ + +----------------------------------------------------------------------------*/ + +#include "config.h" + +#include "musicbrainz4/ISWC.h" + + +class MusicBrainz4::CISWCPrivate +{ + public: + CISWCPrivate() + { + } + + std::string m_ISWC; +}; + +MusicBrainz4::CISWC::CISWC(const XMLNode& Node) +: CEntity(), + m_d(new CISWCPrivate) +{ + if (!Node.isEmpty()) + { + //std::cout << "ISWC node: " << std::endl << Node.createXMLString(true) << std::endl; + + Parse(Node); + + if (Node.getText()) + ProcessItem(Node,m_d->m_ISWC); + } +} + +MusicBrainz4::CISWC::CISWC(const CISWC& Other) +: CEntity(), + m_d(new CISWCPrivate) +{ + *this=Other; +} + +MusicBrainz4::CISWC& MusicBrainz4::CISWC::operator =(const CISWC& Other) +{ + if (this!=&Other) + { + Cleanup(); + + CEntity::operator =(Other); + + m_d->m_ISWC=Other.m_d->m_ISWC; + } + + return *this; +} + +MusicBrainz4::CISWC::~CISWC() +{ + Cleanup(); + + delete m_d; +} + +void MusicBrainz4::CISWC::Cleanup() +{ +} + +MusicBrainz4::CISWC *MusicBrainz4::CISWC::Clone() +{ + return new CISWC(*this); +} + +void MusicBrainz4::CISWC::ParseAttribute(const std::string& Name, const std::string& /*Value*/) +{ + std::cerr << "Unrecognised ISWC attribute: '" << Name << "'" << std::endl; +} + +void MusicBrainz4::CISWC::ParseElement(const XMLNode& Node) +{ + std::string NodeName=Node.getName(); + + std::cerr << "Unrecognised ISWC element: '" << NodeName << "'" << std::endl; +} + +std::string MusicBrainz4::CISWC::GetElementName() +{ + return "iswc"; +} + +std::string MusicBrainz4::CISWC::ISWC() const +{ + return m_d->m_ISWC; +} + +std::ostream& MusicBrainz4::CISWC::Serialise(std::ostream& os) const +{ + os << "ISWC:" << std::endl; + + CEntity::Serialise(os); + + os << "\tISWC: " << ISWC() << std::endl; + + return os; +} === added file 'src/ISWCList.cc' --- src/ISWCList.cc 1970-01-01 00:00:00 +0000 +++ src/ISWCList.cc 2012-06-25 05:56:21 +0000 @@ -0,0 +1,101 @@ +/* -------------------------------------------------------------------------- + + libmusicbrainz4 - Client library to access MusicBrainz + + Copyright (C) 2012 Andrew Hawkins + + This file is part of libmusicbrainz4. + + This library is free software; you can redistribute it and/or + modify it under the terms of v2 of the GNU Lesser General Public + License as published by the Free Software Foundation. + + libmusicbrainz4 is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this library. If not, see . + + $Id$ + +----------------------------------------------------------------------------*/ + +#include "config.h" +#include "musicbrainz4/defines.h" + +#include "musicbrainz4/ISWCList.h" + +#include "musicbrainz4/ISWC.h" + +class MusicBrainz4::CISWCListPrivate +{ + public: + CISWCListPrivate() + { + } +}; + +MusicBrainz4::CISWCList::CISWCList(const XMLNode& Node) +: CListImpl(), + m_d(new CISWCListPrivate) +{ + if (!Node.isEmpty()) + { + //std::cout << "ISWCList node: " << std::endl << Node.createXMLString(true) << std::endl; + + Parse(Node); + } +} + +MusicBrainz4::CISWCList::CISWCList(const CISWCList& Other) +: CListImpl(), + m_d(new CISWCListPrivate) +{ + *this=Other; +} + +MusicBrainz4::CISWCList& MusicBrainz4::CISWCList::operator =(const CISWCList& Other) +{ + if (this!=&Other) + { + CListImpl::operator =(Other); + } + + return *this; +} + +MusicBrainz4::CISWCList::~CISWCList() +{ + delete m_d; +} + +MusicBrainz4::CISWCList *MusicBrainz4::CISWCList::Clone() +{ + return new CISWCList(*this); +} + +void MusicBrainz4::CISWCList::ParseAttribute(const std::string& Name, const std::string& Value) +{ + CListImpl::ParseAttribute(Name,Value); +} + +void MusicBrainz4::CISWCList::ParseElement(const XMLNode& Node) +{ + CListImpl::ParseElement(Node); +} + +std::string MusicBrainz4::CISWCList::GetElementName() +{ + return "iswc-list"; +} + +std::ostream& MusicBrainz4::CISWCList::Serialise(std::ostream& os) const +{ + os << "ISWC list:" << std::endl; + + CListImpl::Serialise(os); + + return os; +} === modified file 'src/Label.cc' --- src/Label.cc 2012-02-01 17:18:10 +0000 +++ src/Label.cc 2012-06-25 05:56:21 +0000 @@ -18,15 +18,19 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: Label.cc 13265 2011-08-25 12:53:44Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ +#include "config.h" +#include "musicbrainz4/defines.h" + #include "musicbrainz4/Label.h" #include #include "musicbrainz4/Lifespan.h" +#include "musicbrainz4/IPI.h" #include "musicbrainz4/Rating.h" #include "musicbrainz4/UserRating.h" #include "musicbrainz4/Alias.h" @@ -35,6 +39,7 @@ #include "musicbrainz4/ReleaseList.h" #include "musicbrainz4/Relation.h" #include "musicbrainz4/RelationList.h" +#include "musicbrainz4/RelationListList.h" #include "musicbrainz4/Tag.h" #include "musicbrainz4/TagList.h" #include "musicbrainz4/UserTag.h" @@ -45,10 +50,11 @@ public: CLabelPrivate() : m_LabelCode(0), + m_IPIList(0), m_Lifespan(0), m_AliasList(0), m_ReleaseList(0), - m_RelationList(0), + m_RelationListList(0), m_TagList(0), m_UserTagList(0), m_Rating(0), @@ -62,17 +68,19 @@ std::string m_SortName; int m_LabelCode; std::string m_IPI; + CIPIList *m_IPIList; std::string m_Disambiguation; std::string m_Country; CLifespan *m_Lifespan; CAliasList *m_AliasList; CReleaseList *m_ReleaseList; - CRelationList *m_RelationList; + CRelationListList *m_RelationListList; CTagList *m_TagList; CUserTagList *m_UserTagList; CRating *m_Rating; CUserRating *m_UserRating; }; + MusicBrainz4::CLabel::CLabel(const XMLNode& Node) : CEntity(), m_d(new CLabelPrivate) @@ -106,6 +114,10 @@ m_d->m_SortName=Other.m_d->m_SortName; m_d->m_LabelCode=Other.m_d->m_LabelCode; m_d->m_IPI=Other.m_d->m_IPI; + + if (Other.m_d->m_IPIList) + m_d->m_IPIList=new CIPIList(*Other.m_d->m_IPIList); + m_d->m_Disambiguation=Other.m_d->m_Disambiguation; m_d->m_Country=Other.m_d->m_Country; @@ -118,8 +130,8 @@ if (Other.m_d->m_ReleaseList) m_d->m_ReleaseList=new CReleaseList(*Other.m_d->m_ReleaseList); - if (Other.m_d->m_RelationList) - m_d->m_RelationList=new CRelationList(*Other.m_d->m_RelationList); + if (Other.m_d->m_RelationListList) + m_d->m_RelationListList=new CRelationListList(*Other.m_d->m_RelationListList); if (Other.m_d->m_TagList) m_d->m_TagList=new CTagList(*Other.m_d->m_TagList); @@ -146,6 +158,9 @@ void MusicBrainz4::CLabel::Cleanup() { + delete m_d->m_IPIList; + m_d->m_IPIList=0; + delete m_d->m_Lifespan; m_d->m_Lifespan=0; @@ -155,8 +170,8 @@ delete m_d->m_ReleaseList; m_d->m_ReleaseList=0; - delete m_d->m_RelationList; - m_d->m_RelationList=0; + delete m_d->m_RelationListList; + m_d->m_RelationListList=0; delete m_d->m_TagList; m_d->m_TagList=0; @@ -176,10 +191,8 @@ return new CLabel(*this); } -bool MusicBrainz4::CLabel::ParseAttribute(const std::string& Name, const std::string& Value) +void MusicBrainz4::CLabel::ParseAttribute(const std::string& Name, const std::string& Value) { - bool RetVal=true; - if ("id"==Name) m_d->m_ID=Value; else if ("type"==Name) @@ -187,81 +200,77 @@ else { std::cerr << "Unrecognised label attribute: '" << Name << "'" << std::endl; - RetVal=false; } - - return RetVal; } -bool MusicBrainz4::CLabel::ParseElement(const XMLNode& Node) +void MusicBrainz4::CLabel::ParseElement(const XMLNode& Node) { - bool RetVal=true; - std::string NodeName=Node.getName(); if ("name"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Name); + ProcessItem(Node,m_d->m_Name); } else if ("sort-name"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_SortName); + ProcessItem(Node,m_d->m_SortName); } else if ("label-code"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_LabelCode); + ProcessItem(Node,m_d->m_LabelCode); } else if ("ipi"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_IPI); + ProcessItem(Node,m_d->m_IPI); + } + else if ("ipi-list"==NodeName) + { + ProcessItem(Node,m_d->m_IPIList); } else if ("disambiguation"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Disambiguation); + ProcessItem(Node,m_d->m_Disambiguation); } else if ("country"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Country); + ProcessItem(Node,m_d->m_Country); } else if ("life-span"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Lifespan); + ProcessItem(Node,m_d->m_Lifespan); } else if ("alias-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_AliasList); + ProcessItem(Node,m_d->m_AliasList); } else if ("release-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_ReleaseList); + ProcessItem(Node,m_d->m_ReleaseList); } else if ("relation-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_RelationList); + ProcessRelationList(Node,m_d->m_RelationListList); } else if ("tag-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_TagList); + ProcessItem(Node,m_d->m_TagList); } else if ("user-tag-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_UserTagList); + ProcessItem(Node,m_d->m_UserTagList); } else if ("rating"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Rating); + ProcessItem(Node,m_d->m_Rating); } else if ("user-rating"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_UserRating); + ProcessItem(Node,m_d->m_UserRating); } else { std::cerr << "Unrecognised label element: '" << NodeName << "'" << std::endl; - RetVal=false; } - - return RetVal; } std::string MusicBrainz4::CLabel::GetElementName() @@ -299,6 +308,11 @@ return m_d->m_IPI; } +MusicBrainz4::CIPIList *MusicBrainz4::CLabel::IPIList() const +{ + return m_d->m_IPIList; +} + std::string MusicBrainz4::CLabel::Disambiguation() const { return m_d->m_Disambiguation; @@ -326,7 +340,12 @@ MusicBrainz4::CRelationList *MusicBrainz4::CLabel::RelationList() const { - return m_d->m_RelationList; + return m_d->m_RelationListList?m_d->m_RelationListList->Item(m_d->m_RelationListList->NumItems()-1):0; +} + +MusicBrainz4::CRelationListList *MusicBrainz4::CLabel::RelationListList() const +{ + return m_d->m_RelationListList; } MusicBrainz4::CTagList *MusicBrainz4::CLabel::TagList() const @@ -360,7 +379,10 @@ os << "\tName: " << Name() << std::endl; os << "\tSort name: " << SortName() << std::endl; os << "\tLabel code: " << LabelCode() << std::endl; - os << "\tIPI: " << IPI() << std::endl; + + if (IPIList()) + os << *IPIList() << std::endl; + os << "\tDisambiguation: " << Disambiguation() << std::endl; os << "\tCountry: " << Country() << std::endl; @@ -373,8 +395,8 @@ if (ReleaseList()) os << *ReleaseList() << std::endl; - if (RelationList()) - os << *RelationList() << std::endl; + if (RelationListList()) + os << *RelationListList() << std::endl; if (TagList()) os << *TagList() << std::endl; === modified file 'src/LabelInfo.cc' --- src/LabelInfo.cc 2012-02-01 17:18:10 +0000 +++ src/LabelInfo.cc 2012-06-25 05:56:21 +0000 @@ -18,10 +18,13 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: LabelInfo.cc 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ +#include "config.h" +#include "musicbrainz4/defines.h" + #include "musicbrainz4/LabelInfo.h" #include "musicbrainz4/Label.h" @@ -92,37 +95,27 @@ return new CLabelInfo(*this); } -bool MusicBrainz4::CLabelInfo::ParseAttribute(const std::string& Name, const std::string& /*Value*/) +void MusicBrainz4::CLabelInfo::ParseAttribute(const std::string& Name, const std::string& /*Value*/) { - bool RetVal=true; - std::cerr << "Unrecognised labelinfo attribute: '" << Name << "'" << std::endl; - RetVal=false; - - return RetVal; } -bool MusicBrainz4::CLabelInfo::ParseElement(const XMLNode& Node) +void MusicBrainz4::CLabelInfo::ParseElement(const XMLNode& Node) { - bool RetVal=true; - std::string NodeName=Node.getName(); if ("catalog-number"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_CatalogNumber); + ProcessItem(Node,m_d->m_CatalogNumber); } else if ("label"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Label); + ProcessItem(Node,m_d->m_Label); } else { std::cerr << "Unrecognised label info element: '" << NodeName << "'" << std::endl; - RetVal=false; } - - return RetVal; } std::string MusicBrainz4::CLabelInfo::GetElementName() === modified file 'src/Lifespan.cc' --- src/Lifespan.cc 2012-02-01 17:18:10 +0000 +++ src/Lifespan.cc 2012-06-25 05:56:21 +0000 @@ -18,10 +18,13 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: Lifespan.cc 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ +#include "config.h" +#include "musicbrainz4/defines.h" + #include "musicbrainz4/Lifespan.h" class MusicBrainz4::CLifespanPrivate @@ -29,6 +32,7 @@ public: std::string m_Begin; std::string m_End; + std::string m_Ended; }; MusicBrainz4::CLifespan::CLifespan(const XMLNode& Node) @@ -58,6 +62,7 @@ m_d->m_Begin=Other.m_d->m_Begin; m_d->m_End=Other.m_d->m_End; + m_d->m_Ended=Other.m_d->m_Ended; } return *this; @@ -73,37 +78,31 @@ return new CLifespan(*this); } -bool MusicBrainz4::CLifespan::ParseAttribute(const std::string& Name, const std::string& /*Value*/) +void MusicBrainz4::CLifespan::ParseAttribute(const std::string& Name, const std::string& /*Value*/) { - bool RetVal=true; - std::cerr << "Unrecognised lifespan attribute: '" << Name << "'" << std::endl; - RetVal=false; - - return RetVal; } -bool MusicBrainz4::CLifespan::ParseElement(const XMLNode& Node) +void MusicBrainz4::CLifespan::ParseElement(const XMLNode& Node) { - bool RetVal=true; - std::string NodeName=Node.getName(); if ("begin"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Begin); + ProcessItem(Node,m_d->m_Begin); } else if ("end"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_End); + ProcessItem(Node,m_d->m_End); + } + else if ("ended"==NodeName) + { + ProcessItem(Node,m_d->m_Ended); } else { std::cerr << "Unrecognised lifespan element: '" << NodeName << "'" << std::endl; - RetVal=false; } - - return RetVal; } std::string MusicBrainz4::CLifespan::GetElementName() @@ -121,6 +120,11 @@ return m_d->m_End; } +std::string MusicBrainz4::CLifespan::Ended() const +{ + return m_d->m_Ended; +} + std::ostream& MusicBrainz4::CLifespan::Serialise(std::ostream& os) const { os << "Lifespan:" << std::endl; @@ -129,6 +133,7 @@ os << "\tBegin: " << Begin() << std::endl; os << "\tEnd: " << End() << std::endl; + os << "\tEnded: " << Ended() << std::endl; return os; } === modified file 'src/List.cc' --- src/List.cc 2012-02-01 17:18:10 +0000 +++ src/List.cc 2012-06-25 05:56:21 +0000 @@ -18,10 +18,13 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: List.cc 13254 2011-08-09 09:29:20Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ +#include "config.h" +#include "musicbrainz4/defines.h" + #include "musicbrainz4/List.h" #include @@ -97,10 +100,8 @@ return new CList(*this); } -bool MusicBrainz4::CList::ParseAttribute(const std::string& Name, const std::string& Value) +void MusicBrainz4::CList::ParseAttribute(const std::string& Name, const std::string& Value) { - bool RetVal=true; - if ("offset"==Name) ProcessItem(Value,m_d->m_Offset); else if ("count"==Name) @@ -108,22 +109,14 @@ else { std::cerr << "Unrecognised list attribute: '" << Name << "'" << std::endl; - RetVal=false; } - - return RetVal; } -bool MusicBrainz4::CList::ParseElement(const XMLNode& Node) +void MusicBrainz4::CList::ParseElement(const XMLNode& Node) { - bool RetVal=true; - std::string NodeName=Node.getName(); std::cerr << "Unrecognised list element: '" << NodeName << "'" << std::endl; - RetVal=false; - - return RetVal; } std::string MusicBrainz4::CList::GetElementName() === modified file 'src/Medium.cc' --- src/Medium.cc 2012-02-01 17:18:10 +0000 +++ src/Medium.cc 2012-06-25 05:56:21 +0000 @@ -18,10 +18,13 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: Medium.cc 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ +#include "config.h" +#include "musicbrainz4/defines.h" + #include "musicbrainz4/Medium.h" #include "musicbrainz4/Disc.h" @@ -108,49 +111,39 @@ return new CMedium(*this); } -bool MusicBrainz4::CMedium::ParseAttribute(const std::string& Name, const std::string& /*Value*/) +void MusicBrainz4::CMedium::ParseAttribute(const std::string& Name, const std::string& /*Value*/) { - bool RetVal=true; - std::cerr << "Unrecognised medium attribute: '" << Name << "'" << std::endl; - RetVal=false; - - return RetVal; } -bool MusicBrainz4::CMedium::ParseElement(const XMLNode& Node) +void MusicBrainz4::CMedium::ParseElement(const XMLNode& Node) { - bool RetVal=true; - std::string NodeName=Node.getName(); if ("title"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Title); + ProcessItem(Node,m_d->m_Title); } else if ("position"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Position); + ProcessItem(Node,m_d->m_Position); } else if ("format"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Format); + ProcessItem(Node,m_d->m_Format); } else if ("disc-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_DiscList); + ProcessItem(Node,m_d->m_DiscList); } else if ("track-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_TrackList); + ProcessItem(Node,m_d->m_TrackList); } else { std::cerr << "Unrecognised medium element: '" << NodeName << "'" << std::endl; - RetVal=false; } - - return RetVal; } std::string MusicBrainz4::CMedium::GetElementName() === modified file 'src/MediumList.cc' --- src/MediumList.cc 2012-02-01 17:18:10 +0000 +++ src/MediumList.cc 2012-06-25 05:56:21 +0000 @@ -18,10 +18,13 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: MediumList.cc 13254 2011-08-09 09:29:20Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ +#include "config.h" +#include "musicbrainz4/defines.h" + #include "musicbrainz4/MediumList.h" #include "musicbrainz4/Medium.h" @@ -78,27 +81,23 @@ return new CMediumList(*this); } -bool MusicBrainz4::CMediumList::ParseAttribute(const std::string& Name, const std::string& Value) +void MusicBrainz4::CMediumList::ParseAttribute(const std::string& Name, const std::string& Value) { - return CListImpl::ParseAttribute(Name,Value); + CListImpl::ParseAttribute(Name,Value); } -bool MusicBrainz4::CMediumList::ParseElement(const XMLNode& Node) +void MusicBrainz4::CMediumList::ParseElement(const XMLNode& Node) { - bool RetVal=true; - std::string NodeName=Node.getName(); if ("track-count"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_TrackCount); + ProcessItem(Node,m_d->m_TrackCount); } else { - RetVal=CListImpl::ParseElement(Node); + CListImpl::ParseElement(Node); } - - return RetVal; } std::string MusicBrainz4::CMediumList::GetElementName() === modified file 'src/Message.cc' --- src/Message.cc 2012-02-01 17:18:10 +0000 +++ src/Message.cc 2012-06-25 05:56:21 +0000 @@ -18,10 +18,13 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: Message.cc 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ +#include "config.h" +#include "musicbrainz4/defines.h" + #include "musicbrainz4/Message.h" class MusicBrainz4::CMessagePrivate @@ -71,31 +74,21 @@ return new CMessage(*this); } -bool MusicBrainz4::CMessage::ParseAttribute(const std::string& Name, const std::string& /*Value*/) +void MusicBrainz4::CMessage::ParseAttribute(const std::string& Name, const std::string& /*Value*/) { - bool RetVal=true; - std::cerr << "Unrecognised message attribute: '" << Name << "'" << std::endl; - RetVal=false; - - return RetVal; } -bool MusicBrainz4::CMessage::ParseElement(const XMLNode& Node) +void MusicBrainz4::CMessage::ParseElement(const XMLNode& Node) { - bool RetVal=true; - std::string NodeName=Node.getName(); if (NodeName=="text") - RetVal=ProcessItem(Node,m_d->m_Text); + ProcessItem(Node,m_d->m_Text); else { std::cerr << "Unrecognised message element: '" << NodeName << "'" << std::endl; - RetVal=false; } - - return RetVal; } std::string MusicBrainz4::CMessage::GetElementName() === modified file 'src/Metadata.cc' --- src/Metadata.cc 2012-02-01 17:18:10 +0000 +++ src/Metadata.cc 2012-06-25 05:56:21 +0000 @@ -18,10 +18,13 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: Metadata.cc 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ +#include "config.h" +#include "musicbrainz4/defines.h" + #include "musicbrainz4/Metadata.h" #include "musicbrainz4/Artist.h" @@ -346,10 +349,8 @@ return new CMetadata(*this); } -bool MusicBrainz4::CMetadata::ParseAttribute(const std::string& Name, const std::string& Value) +void MusicBrainz4::CMetadata::ParseAttribute(const std::string& Name, const std::string& Value) { - bool RetVal=true; - if ("xmlns"==Name) m_d->m_XMLNS=Value; else if ("xmlns:ext"==Name) @@ -361,133 +362,125 @@ else { std::cerr << "Unrecognised metadata attribute: '" << Name << "'" << std::endl; - RetVal=false; } - - return RetVal; } -bool MusicBrainz4::CMetadata::ParseElement(const XMLNode& Node) +void MusicBrainz4::CMetadata::ParseElement(const XMLNode& Node) { - bool RetVal=true; - std::string NodeName=Node.getName(); if ("artist"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Artist); + ProcessItem(Node,m_d->m_Artist); } else if ("release"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Release); + ProcessItem(Node,m_d->m_Release); } else if ("release-group"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_ReleaseGroup); + ProcessItem(Node,m_d->m_ReleaseGroup); } else if ("recording"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Recording); + ProcessItem(Node,m_d->m_Recording); } else if ("label"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Label); + ProcessItem(Node,m_d->m_Label); } else if ("work"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Work); + ProcessItem(Node,m_d->m_Work); } else if ("puid"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_PUID); + ProcessItem(Node,m_d->m_PUID); } else if ("isrc"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_ISRC); + ProcessItem(Node,m_d->m_ISRC); } else if ("disc"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Disc); + ProcessItem(Node,m_d->m_Disc); } else if ("rating"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Rating); + ProcessItem(Node,m_d->m_Rating); } else if ("user-rating"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_UserRating); + ProcessItem(Node,m_d->m_UserRating); } else if ("collection"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Collection); + ProcessItem(Node,m_d->m_Collection); } else if ("artist-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_ArtistList); + ProcessItem(Node,m_d->m_ArtistList); } else if ("release-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_ReleaseList); + ProcessItem(Node,m_d->m_ReleaseList); } else if ("release-group-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_ReleaseGroupList); + ProcessItem(Node,m_d->m_ReleaseGroupList); } else if ("recording-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_RecordingList); + ProcessItem(Node,m_d->m_RecordingList); } else if ("label-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_LabelList); + ProcessItem(Node,m_d->m_LabelList); } else if ("work-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_WorkList); + ProcessItem(Node,m_d->m_WorkList); } else if ("isrc-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_ISRCList); + ProcessItem(Node,m_d->m_ISRCList); } else if ("annotation-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_AnnotationList); + ProcessItem(Node,m_d->m_AnnotationList); } else if ("cdstub-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_CDStubList); + ProcessItem(Node,m_d->m_CDStubList); } else if ("freedb-disc-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_FreeDBDiscList); + ProcessItem(Node,m_d->m_FreeDBDiscList); } else if ("tag-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_TagList); + ProcessItem(Node,m_d->m_TagList); } else if ("user-tag-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_UserTagList); + ProcessItem(Node,m_d->m_UserTagList); } else if ("collection-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_CollectionList); + ProcessItem(Node,m_d->m_CollectionList); } else if ("cdstub"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_CDStub); + ProcessItem(Node,m_d->m_CDStub); } else if ("message"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Message); + ProcessItem(Node,m_d->m_Message); } else { std::cerr << "Unrecognised metadata element: '" << NodeName << "'" << std::endl; - RetVal=false; } - - return RetVal; } std::string MusicBrainz4::CMetadata::GetElementName() === modified file 'src/NameCredit.cc' --- src/NameCredit.cc 2012-02-01 17:18:10 +0000 +++ src/NameCredit.cc 2012-06-25 05:56:21 +0000 @@ -18,10 +18,13 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: NameCredit.cc 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ +#include "config.h" +#include "musicbrainz4/defines.h" + #include "musicbrainz4/NameCredit.h" #include "musicbrainz4/Artist.h" @@ -94,43 +97,32 @@ return new CNameCredit(*this); } -bool MusicBrainz4::CNameCredit::ParseAttribute(const std::string& Name, const std::string& Value) +void MusicBrainz4::CNameCredit::ParseAttribute(const std::string& Name, const std::string& Value) { - bool RetVal=true; - if ("joinphrase"==Name) m_d->m_JoinPhrase=Value; else { std::cerr << "Unrecognised namecredit attribute: '" << Name << "'" << std::endl; - RetVal=false; } - - return RetVal; } -bool MusicBrainz4::CNameCredit::ParseElement(const XMLNode& Node) +void MusicBrainz4::CNameCredit::ParseElement(const XMLNode& Node) { - bool RetVal=true; - - std::string NodeName=Node.getName(); if ("name"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Name); + ProcessItem(Node,m_d->m_Name); } else if ("artist"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Artist); + ProcessItem(Node,m_d->m_Artist); } else { std::cerr << "Unrecognised name credit element: '" << NodeName << "'" << std::endl; - RetVal=false; } - - return RetVal; } std::string MusicBrainz4::CNameCredit::GetElementName() === modified file 'src/NonMBTrack.cc' --- src/NonMBTrack.cc 2012-02-01 17:18:10 +0000 +++ src/NonMBTrack.cc 2012-06-25 05:56:21 +0000 @@ -18,10 +18,13 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: NonMBTrack.cc 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ +#include "config.h" +#include "musicbrainz4/defines.h" + #include "musicbrainz4/NonMBTrack.h" class MusicBrainz4::CNonMBTrackPrivate @@ -80,41 +83,31 @@ return new CNonMBTrack(*this); } -bool MusicBrainz4::CNonMBTrack::ParseAttribute(const std::string& Name, const std::string& /*Value*/) +void MusicBrainz4::CNonMBTrack::ParseAttribute(const std::string& Name, const std::string& /*Value*/) { - bool RetVal=true; - std::cerr << "Unrecognised non MB track attribute: '" << Name << "'" << std::endl; - RetVal=false; - - return RetVal; } -bool MusicBrainz4::CNonMBTrack::ParseElement(const XMLNode& Node) +void MusicBrainz4::CNonMBTrack::ParseElement(const XMLNode& Node) { - bool RetVal=true; - std::string NodeName=Node.getName(); if ("title"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Title); + ProcessItem(Node,m_d->m_Title); } else if ("artist"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Artist); + ProcessItem(Node,m_d->m_Artist); } else if ("length"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Length); + ProcessItem(Node,m_d->m_Length); } else { std::cerr << "Unrecognised non MB track element: '" << NodeName << "'" << std::endl; - RetVal=false; } - - return RetVal; } std::string MusicBrainz4::CNonMBTrack::GetElementName() === modified file 'src/PUID.cc' --- src/PUID.cc 2012-02-01 17:18:10 +0000 +++ src/PUID.cc 2012-06-25 05:56:21 +0000 @@ -18,10 +18,13 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: PUID.cc 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ +#include "config.h" +#include "musicbrainz4/defines.h" + #include "musicbrainz4/PUID.h" #include "musicbrainz4/RecordingList.h" @@ -93,38 +96,28 @@ return new CPUID(*this); } -bool MusicBrainz4::CPUID::ParseAttribute(const std::string& Name, const std::string& Value) +void MusicBrainz4::CPUID::ParseAttribute(const std::string& Name, const std::string& Value) { - bool RetVal=true; - if ("id"==Name) m_d->m_ID=Value; else { std::cerr << "Unrecognised puid attribute: '" << Name << "'" << std::endl; - RetVal=false; } - - return RetVal; } -bool MusicBrainz4::CPUID::ParseElement(const XMLNode& Node) +void MusicBrainz4::CPUID::ParseElement(const XMLNode& Node) { - bool RetVal=true; - std::string NodeName=Node.getName(); if ("recording-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_RecordingList); + ProcessItem(Node,m_d->m_RecordingList); } else { std::cerr << "Unrecognised PUID element: '" << NodeName << "'" << std::endl; - RetVal=false; } - - return RetVal; } std::string MusicBrainz4::CPUID::GetElementName() === modified file 'src/Query.cc' --- src/Query.cc 2012-02-01 17:18:10 +0000 +++ src/Query.cc 2012-06-25 05:56:21 +0000 @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: Query.cc 13266 2011-08-25 12:56:47Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ @@ -26,12 +26,16 @@ //http://bugs.musicbrainz.org/browser/mmd-schema/trunk/schema/musicbrainz_mmd-2.0.rng //http://wiki.musicbrainz.org/Picard_Tag_Mapping +#include "config.h" +#include "musicbrainz4/defines.h" + #include "musicbrainz4/Query.h" #include #include #include +#include #include #include @@ -42,8 +46,6 @@ #include "musicbrainz4/ReleaseList.h" #include "musicbrainz4/Release.h" -#include "config.h" - class MusicBrainz4::CQueryPrivate { public: @@ -141,14 +143,19 @@ try { int Ret=Fetch.Fetch(Query); - //std::cout << "Ret: " << Ret << std::endl; + +#ifdef _MB4_DEBUG_ + std::cerr << "Ret: " << Ret << std::endl; +#endif if (Ret>0) { std::vector Data=Fetch.Data(); std::string strData(Data.begin(),Data.end()); - //std::cout << "Ret is '" << strData << "'" << std::endl; +#ifdef _MB4_DEBUG_ + std::cerr << "Ret is '" << strData << "'" << std::endl; +#endif XMLResults Results; XMLNode TopNode=XMLNode::parseString(strData.c_str(), 0, &Results); @@ -237,7 +244,9 @@ if (!Params.empty()) os << "?" << URLEncode(Params); - //std::cout << "Query is '" << os.str() << "'" << std::endl; +#ifdef _MB4_DEBUG_ + std::cerr << "Query is '" << os.str() << "'" << std::endl; +#endif return PerformQuery(os.str()); } @@ -364,16 +373,24 @@ try { - //std::cout << "Collection " << Action << " Query is '" << Query << "'" << std::endl; +#ifdef _MB4_DEBUG_ + std::cerr << "Collection " << Action << " Query is '" << Query << "'" << std::endl; +#endif int Ret=Fetch.Fetch(Query,Action); - //std::cout << "Collection Ret: " << Ret << std::endl; + +#ifdef _MB4_DEBUG_ + std::cerr << "Collection Ret: " << Ret << std::endl; +#endif + if (Ret>0) { std::vector Data=Fetch.Data(); std::string strData(Data.begin(),Data.end()); - //std::cout << "Collection " << Action << " ret is '" << strData << "'" << std::endl; +#ifdef _MB4_DEBUG_ + std::cerr << "Collection " << Action << " ret is '" << strData << "'" << std::endl; +#endif XMLResults Results; XMLNode TopNode=XMLNode::parseString(strData.c_str(), 0, &Results); === modified file 'src/Rating.cc' --- src/Rating.cc 2012-02-01 17:18:10 +0000 +++ src/Rating.cc 2012-06-25 05:56:21 +0000 @@ -18,10 +18,13 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: Rating.cc 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ +#include "config.h" +#include "musicbrainz4/defines.h" + #include "musicbrainz4/Rating.h" class MusicBrainz4::CRatingPrivate @@ -84,33 +87,23 @@ return new CRating(*this); } -bool MusicBrainz4::CRating::ParseAttribute(const std::string& Name, const std::string& Value) +void MusicBrainz4::CRating::ParseAttribute(const std::string& Name, const std::string& Value) { - bool RetVal=true; - if ("votes-count"==Name) { - RetVal=ProcessItem(Value,m_d->m_VotesCount); + ProcessItem(Value,m_d->m_VotesCount); } else { std::cerr << "Unrecognised rating attribute: '" << Name << "'" << std::endl; - RetVal=false; } - - return RetVal; } -bool MusicBrainz4::CRating::ParseElement(const XMLNode& Node) +void MusicBrainz4::CRating::ParseElement(const XMLNode& Node) { - bool RetVal=true; - std::string NodeName=Node.getName(); std::cerr << "Unrecognised rating attribute: '" << NodeName << "'" << std::endl; - RetVal=false; - - return RetVal; } std::string MusicBrainz4::CRating::GetElementName() === modified file 'src/Recording.cc' --- src/Recording.cc 2012-02-01 17:18:10 +0000 +++ src/Recording.cc 2012-06-25 05:56:21 +0000 @@ -18,10 +18,13 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: Recording.cc 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ +#include "config.h" +#include "musicbrainz4/defines.h" + #include "musicbrainz4/Recording.h" #include "musicbrainz4/ArtistCredit.h" @@ -33,7 +36,7 @@ #include "musicbrainz4/PUID.h" #include "musicbrainz4/ISRCList.h" #include "musicbrainz4/ISRC.h" -#include "musicbrainz4/RelationList.h" +#include "musicbrainz4/RelationListList.h" #include "musicbrainz4/Relation.h" #include "musicbrainz4/TagList.h" #include "musicbrainz4/Tag.h" @@ -49,7 +52,7 @@ m_ReleaseList(0), m_PUIDList(0), m_ISRCList(0), - m_RelationList(0), + m_RelationListList(0), m_TagList(0), m_UserTagList(0), m_Rating(0), @@ -65,7 +68,7 @@ CReleaseList *m_ReleaseList; CPUIDList *m_PUIDList; CISRCList *m_ISRCList; - CRelationList *m_RelationList; + CRelationListList *m_RelationListList; CTagList *m_TagList; CUserTagList *m_UserTagList; CRating *m_Rating; @@ -78,7 +81,7 @@ { if (!Node.isEmpty()) { - //std::cout << "Metadata node: " << std::endl << Node.createXMLString(true) << std::endl; + //std::cout << "Recording node: " << std::endl << Node.createXMLString(true) << std::endl; Parse(Node); } @@ -116,8 +119,8 @@ if (Other.m_d->m_ISRCList) m_d->m_ISRCList=new CISRCList(*Other.m_d->m_ISRCList); - if (Other.m_d->m_RelationList) - m_d->m_RelationList=new CRelationList(*Other.m_d->m_RelationList); + if (Other.m_d->m_RelationListList) + m_d->m_RelationListList=new CRelationListList(*Other.m_d->m_RelationListList); if (Other.m_d->m_TagList) m_d->m_TagList=new CTagList(*Other.m_d->m_TagList); @@ -147,82 +150,72 @@ return new CRecording(*this); } -bool MusicBrainz4::CRecording::ParseAttribute(const std::string& Name, const std::string& Value) +void MusicBrainz4::CRecording::ParseAttribute(const std::string& Name, const std::string& Value) { - bool RetVal=true; - if ("id"==Name) m_d->m_ID=Value; else { std::cerr << "Unrecognised recording attribute: '" << Name << "'" << std::endl; - RetVal=false; } - - return RetVal; } -bool MusicBrainz4::CRecording::ParseElement(const XMLNode& Node) +void MusicBrainz4::CRecording::ParseElement(const XMLNode& Node) { - bool RetVal=true; - std::string NodeName=Node.getName(); if ("title"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Title); + ProcessItem(Node,m_d->m_Title); } else if ("length"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Length); + ProcessItem(Node,m_d->m_Length); } else if ("disambiguation"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Disambiguation); + ProcessItem(Node,m_d->m_Disambiguation); } else if ("artist-credit"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_ArtistCredit); + ProcessItem(Node,m_d->m_ArtistCredit); } else if ("release-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_ReleaseList); + ProcessItem(Node,m_d->m_ReleaseList); } else if ("puid-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_PUIDList); + ProcessItem(Node,m_d->m_PUIDList); } else if ("isrc-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_ISRCList); + ProcessItem(Node,m_d->m_ISRCList); } else if ("relation-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_RelationList); + ProcessRelationList(Node,m_d->m_RelationListList); } else if ("tag-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_TagList); + ProcessItem(Node,m_d->m_TagList); } else if ("user-tag-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_UserTagList); + ProcessItem(Node,m_d->m_UserTagList); } else if ("rating"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Rating); + ProcessItem(Node,m_d->m_Rating); } else if ("user-rating"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_UserRating); + ProcessItem(Node,m_d->m_UserRating); } else { std::cerr << "Unrecognised recording element: '" << NodeName << "'" << std::endl; - RetVal=false; } - - return RetVal; } std::string MusicBrainz4::CRecording::GetElementName() @@ -244,8 +237,8 @@ delete m_d->m_ISRCList; m_d->m_ISRCList=0; - delete m_d->m_RelationList; - m_d->m_RelationList=0; + delete m_d->m_RelationListList; + m_d->m_RelationListList=0; delete m_d->m_TagList; m_d->m_TagList=0; @@ -302,7 +295,12 @@ MusicBrainz4::CRelationList *MusicBrainz4::CRecording::RelationList() const { - return m_d->m_RelationList; + return m_d->m_RelationListList?m_d->m_RelationListList->Item(m_d->m_RelationListList->NumItems()-1):0; +} + +MusicBrainz4::CRelationListList *MusicBrainz4::CRecording::RelationListList() const +{ + return m_d->m_RelationListList; } MusicBrainz4::CTagList *MusicBrainz4::CRecording::TagList() const @@ -348,8 +346,8 @@ if (ISRCList()) os << *ISRCList() << std::endl; - if (RelationList()) - os << *RelationList() << std::endl; + if (RelationListList()) + os << *RelationListList() << std::endl; if (TagList()) os << *TagList() << std::endl; === modified file 'src/Relation.cc' --- src/Relation.cc 2012-02-01 17:18:10 +0000 +++ src/Relation.cc 2012-06-25 05:56:21 +0000 @@ -18,10 +18,13 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: Relation.cc 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ +#include "config.h" +#include "musicbrainz4/defines.h" + #include "musicbrainz4/Relation.h" #include "musicbrainz4/Artist.h" @@ -156,78 +159,68 @@ return new CRelation(*this); } -bool MusicBrainz4::CRelation::ParseAttribute(const std::string& Name, const std::string& Value) +void MusicBrainz4::CRelation::ParseAttribute(const std::string& Name, const std::string& Value) { - bool RetVal=true; - if ("type"==Name) m_d->m_Type=Value; else { std::cerr << "Unrecognised relation attribute: '" << Name << "'" << std::endl; - RetVal=false; } - - return RetVal; } -bool MusicBrainz4::CRelation::ParseElement(const XMLNode& Node) +void MusicBrainz4::CRelation::ParseElement(const XMLNode& Node) { - bool RetVal=true; - std::string NodeName=Node.getName(); if ("target"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Target); + ProcessItem(Node,m_d->m_Target); } else if ("direction"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Direction); + ProcessItem(Node,m_d->m_Direction); } else if ("attribute-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_AttributeList); + ProcessItem(Node,m_d->m_AttributeList); } else if ("begin"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Begin); + ProcessItem(Node,m_d->m_Begin); } else if ("end"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_End); + ProcessItem(Node,m_d->m_End); } else if ("artist"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Artist); + ProcessItem(Node,m_d->m_Artist); } else if ("release"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Release); + ProcessItem(Node,m_d->m_Release); } else if ("release-group"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_ReleaseGroup); + ProcessItem(Node,m_d->m_ReleaseGroup); } else if ("recording"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Recording); + ProcessItem(Node,m_d->m_Recording); } else if ("label"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Label); + ProcessItem(Node,m_d->m_Label); } else if ("work"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Work); + ProcessItem(Node,m_d->m_Work); } else { std::cerr << "Unrecognised relation element: '" << NodeName << "'" << std::endl; - RetVal=false; } - - return RetVal; } std::string MusicBrainz4::CRelation::GetElementName() === modified file 'src/RelationList.cc' --- src/RelationList.cc 2012-02-01 17:18:10 +0000 +++ src/RelationList.cc 2012-06-25 05:56:21 +0000 @@ -18,10 +18,13 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: RelationList.cc 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ +#include "config.h" +#include "musicbrainz4/defines.h" + #include "musicbrainz4/RelationList.h" #include "musicbrainz4/Relation.h" @@ -73,21 +76,17 @@ return new CRelationList(*this); } -bool MusicBrainz4::CRelationList::ParseAttribute(const std::string& Name, const std::string& Value) +void MusicBrainz4::CRelationList::ParseAttribute(const std::string& Name, const std::string& Value) { - bool RetVal=true; - if ("target-type"==Name) - RetVal=ProcessItem(Name,m_d->m_TargetType); + ProcessItem(Value,m_d->m_TargetType); else - RetVal=CListImpl::ParseAttribute(Name,Value); - - return RetVal; + CListImpl::ParseAttribute(Name,Value); } -bool MusicBrainz4::CRelationList::ParseElement(const XMLNode& Node) +void MusicBrainz4::CRelationList::ParseElement(const XMLNode& Node) { - return CListImpl::ParseElement(Node); + CListImpl::ParseElement(Node); } std::string MusicBrainz4::CRelationList::GetElementName() === added file 'src/RelationListList.cc' --- src/RelationListList.cc 1970-01-01 00:00:00 +0000 +++ src/RelationListList.cc 2012-06-25 05:56:21 +0000 @@ -0,0 +1,148 @@ +/* -------------------------------------------------------------------------- + + libmusicbrainz4 - Client library to access MusicBrainz + + Copyright (C) 2011 Andrew Hawkins + + This file is part of libmusicbrainz4. + + This library is free software; you can redistribute it and/or + modify it under the terms of v2 of the GNU Lesser General Public + License as published by the Free Software Foundation. + + libmusicbrainz4 is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this library. If not, see . + + $Id$ + +----------------------------------------------------------------------------*/ + +#include "config.h" +#include "musicbrainz4/defines.h" + +#include "musicbrainz4/RelationListList.h" + +#include + +#include "musicbrainz4/RelationList.h" +#include "musicbrainz4/Relation.h" + +class MusicBrainz4::CRelationListListPrivate +{ + public: + CRelationListListPrivate() + : m_ListGroup(0) + { + } + + std::vector *m_ListGroup; +}; + +MusicBrainz4::CRelationListList::CRelationListList() +: m_d(new CRelationListListPrivate) +{ +} + +MusicBrainz4::CRelationListList::CRelationListList(const CRelationListList& Other) +: m_d(new CRelationListListPrivate) +{ + *this=Other; +} + +MusicBrainz4::CRelationListList& MusicBrainz4::CRelationListList::operator =(const CRelationListList& Other) +{ + if (this!=&Other) + { + Cleanup(); + + if (Other.m_d->m_ListGroup) + { + m_d->m_ListGroup=new std::vector; + + for (std::vector::const_iterator ThisRelationList=Other.m_d->m_ListGroup->begin();ThisRelationList!=Other.m_d->m_ListGroup->end();++ThisRelationList) + { + CRelationList *RelationList=*ThisRelationList; + m_d->m_ListGroup->push_back(new CRelationList(*RelationList)); + } + } + } + + return *this; +} + +MusicBrainz4::CRelationListList::~CRelationListList() +{ + Cleanup(); + + delete m_d; +} + +void MusicBrainz4::CRelationListList::Cleanup() +{ + if (m_d->m_ListGroup) + { + for (std::vector::const_iterator ThisRelationList=m_d->m_ListGroup->begin();ThisRelationList!=m_d->m_ListGroup->end();++ThisRelationList) + { + CRelationList *RelationList=*ThisRelationList; + + delete RelationList; + } + } + + delete m_d->m_ListGroup; + m_d->m_ListGroup=0; +} + +void MusicBrainz4::CRelationListList::Add(CRelationList *RelationList) +{ + if (!m_d->m_ListGroup) + m_d->m_ListGroup=new std::vector; + + m_d->m_ListGroup->push_back(new CRelationList(*RelationList)); +} + +int MusicBrainz4::CRelationListList::NumItems() const +{ + int Ret=0; + + if (m_d->m_ListGroup) + Ret=m_d->m_ListGroup->size(); + + return Ret; +} + +MusicBrainz4::CRelationList *MusicBrainz4::CRelationListList::Item(int Item) const +{ + CRelationList *RelationList=0; + + if (m_d->m_ListGroup && Item<(int)m_d->m_ListGroup->size()) + RelationList=(*m_d->m_ListGroup)[Item]; + + return RelationList; +} + +std::ostream& MusicBrainz4::CRelationListList::Serialise(std::ostream& os) const +{ + if (m_d->m_ListGroup && m_d->m_ListGroup->size()!=0) + { + os << "RelationLists:" << std::endl; + + for (int count=0;count. - $Id: Release.cc 13385 2012-01-15 15:19:56Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ +#include "config.h" +#include "musicbrainz4/defines.h" + #include "musicbrainz4/Release.h" #include @@ -33,6 +36,7 @@ #include "musicbrainz4/LabelInfoList.h" #include "musicbrainz4/LabelInfo.h" #include "musicbrainz4/RelationList.h" +#include "musicbrainz4/RelationListList.h" #include "musicbrainz4/Relation.h" #include "musicbrainz4/MediumList.h" #include "musicbrainz4/Medium.h" @@ -48,7 +52,7 @@ m_ReleaseGroup(0), m_LabelInfoList(0), m_MediumList(0), - m_RelationList(0), + m_RelationListList(0), m_CollectionList(0) { } @@ -68,7 +72,7 @@ std::string m_ASIN; CLabelInfoList *m_LabelInfoList; CMediumList *m_MediumList; - CRelationList *m_RelationList; + CRelationListList *m_RelationListList; CCollectionList *m_CollectionList; }; @@ -126,8 +130,8 @@ if (Other.m_d->m_MediumList) m_d->m_MediumList=new CMediumList(*Other.m_d->m_MediumList); - if (Other.m_d->m_RelationList) - m_d->m_RelationList=new CRelationList(*Other.m_d->m_RelationList); + if (Other.m_d->m_RelationListList) + m_d->m_RelationListList=new CRelationListList(*Other.m_d->m_RelationListList); if (Other.m_d->m_CollectionList) m_d->m_CollectionList=new CCollectionList(*Other.m_d->m_CollectionList); @@ -160,8 +164,8 @@ delete m_d->m_MediumList; m_d->m_MediumList=0; - delete m_d->m_RelationList; - m_d->m_RelationList=0; + delete m_d->m_RelationListList; + m_d->m_RelationListList=0; } MusicBrainz4::CRelease *MusicBrainz4::CRelease::Clone() @@ -169,98 +173,88 @@ return new CRelease(*this); } -bool MusicBrainz4::CRelease::ParseAttribute(const std::string& Name, const std::string& Value) +void MusicBrainz4::CRelease::ParseAttribute(const std::string& Name, const std::string& Value) { - bool RetVal=true; - if ("id"==Name) m_d->m_ID=Value; else { std::cerr << "Unrecognised release attribute: '" << Name << "'" << std::endl; - RetVal=false; } - - return RetVal; } -bool MusicBrainz4::CRelease::ParseElement(const XMLNode& Node) +void MusicBrainz4::CRelease::ParseElement(const XMLNode& Node) { - bool RetVal=true; - std::string NodeName=Node.getName(); if ("title"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Title); + ProcessItem(Node,m_d->m_Title); } else if ("status"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Status); + ProcessItem(Node,m_d->m_Status); } else if ("quality"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Quality); + ProcessItem(Node,m_d->m_Quality); } else if ("disambiguation"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Disambiguation); + ProcessItem(Node,m_d->m_Disambiguation); } else if ("packaging"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Packaging); + ProcessItem(Node,m_d->m_Packaging); } else if ("text-representation"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_TextRepresentation); + ProcessItem(Node,m_d->m_TextRepresentation); } else if ("artist-credit"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_ArtistCredit); + ProcessItem(Node,m_d->m_ArtistCredit); } else if ("release-group"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_ReleaseGroup); + ProcessItem(Node,m_d->m_ReleaseGroup); } else if ("date"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Date); + ProcessItem(Node,m_d->m_Date); } else if ("country"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Country); + ProcessItem(Node,m_d->m_Country); } else if ("barcode"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Barcode); + ProcessItem(Node,m_d->m_Barcode); } else if ("asin"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_ASIN); + ProcessItem(Node,m_d->m_ASIN); } else if ("label-info-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_LabelInfoList); + ProcessItem(Node,m_d->m_LabelInfoList); } else if ("medium-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_MediumList); + ProcessItem(Node,m_d->m_MediumList); } else if ("relation-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_RelationList); + ProcessRelationList(Node,m_d->m_RelationListList); } else if ("collection-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_CollectionList); + ProcessItem(Node,m_d->m_CollectionList); } else { std::cerr << "Unrecognised release element: '" << NodeName << "'" << std::endl; - RetVal=false; } - - return RetVal; } std::string MusicBrainz4::CRelease::GetElementName() @@ -345,7 +339,12 @@ MusicBrainz4::CRelationList *MusicBrainz4::CRelease::RelationList() const { - return m_d->m_RelationList; + return m_d->m_RelationListList?m_d->m_RelationListList->Item(m_d->m_RelationListList->NumItems()-1):0; +} + +MusicBrainz4::CRelationListList *MusicBrainz4::CRelease::RelationListList() const +{ + return m_d->m_RelationListList; } MusicBrainz4::CCollectionList *MusicBrainz4::CRelease::CollectionList() const @@ -404,8 +403,8 @@ if (MediumList()) os << *MediumList() << std::endl; - if (RelationList()) - os << *RelationList() << std::endl; + if (RelationListList()) + os << *RelationListList() << std::endl; if (CollectionList()) os << *CollectionList() << std::endl; === modified file 'src/ReleaseGroup.cc' --- src/ReleaseGroup.cc 2012-02-01 17:18:10 +0000 +++ src/ReleaseGroup.cc 2012-06-25 05:56:21 +0000 @@ -18,10 +18,13 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: ReleaseGroup.cc 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ +#include "config.h" +#include "musicbrainz4/defines.h" + #include "musicbrainz4/ReleaseGroup.h" #include "musicbrainz4/ArtistCredit.h" @@ -30,11 +33,14 @@ #include "musicbrainz4/ReleaseList.h" #include "musicbrainz4/Release.h" #include "musicbrainz4/RelationList.h" +#include "musicbrainz4/RelationListList.h" #include "musicbrainz4/Relation.h" #include "musicbrainz4/TagList.h" #include "musicbrainz4/Tag.h" #include "musicbrainz4/UserTagList.h" #include "musicbrainz4/UserTag.h" +#include "musicbrainz4/SecondaryTypeList.h" +#include "musicbrainz4/SecondaryType.h" class MusicBrainz4::CReleaseGroupPrivate { @@ -42,26 +48,29 @@ CReleaseGroupPrivate() : m_ArtistCredit(0), m_ReleaseList(0), - m_RelationList(0), + m_RelationListList(0), m_TagList(0), m_UserTagList(0), m_Rating(0), - m_UserRating(0) + m_UserRating(0), + m_SecondaryTypeList(0) { } std::string m_ID; std::string m_Type; + std::string m_PrimaryType; std::string m_Title; std::string m_Disambiguation; std::string m_FirstReleaseDate; CArtistCredit *m_ArtistCredit; CReleaseList *m_ReleaseList; - CRelationList *m_RelationList; + CRelationListList *m_RelationListList; CTagList *m_TagList; CUserTagList *m_UserTagList; CRating *m_Rating; CUserRating *m_UserRating; + CSecondaryTypeList *m_SecondaryTypeList; }; MusicBrainz4::CReleaseGroup::CReleaseGroup(const XMLNode& Node) @@ -93,6 +102,7 @@ m_d->m_ID=Other.m_d->m_ID; m_d->m_Type=Other.m_d->m_Type; + m_d->m_PrimaryType=Other.m_d->m_PrimaryType; m_d->m_Title=Other.m_d->m_Title; m_d->m_Disambiguation=Other.m_d->m_Disambiguation; m_d->m_FirstReleaseDate=Other.m_d->m_FirstReleaseDate; @@ -103,8 +113,8 @@ if (Other.m_d->m_ReleaseList) m_d->m_ReleaseList=new CReleaseList(*Other.m_d->m_ReleaseList); - if (Other.m_d->m_RelationList) - m_d->m_RelationList=new CRelationList(*Other.m_d->m_RelationList); + if (Other.m_d->m_RelationListList) + m_d->m_RelationListList=new CRelationListList(*Other.m_d->m_RelationListList); if (Other.m_d->m_TagList) m_d->m_TagList=new CTagList(*Other.m_d->m_TagList); @@ -117,6 +127,9 @@ if (Other.m_d->m_UserRating) m_d->m_UserRating=new CUserRating(*Other.m_d->m_UserRating); + + if (Other.m_d->m_SecondaryTypeList) + m_d->m_SecondaryTypeList=new CSecondaryTypeList(*Other.m_d->m_SecondaryTypeList); } return *this; @@ -137,8 +150,8 @@ delete m_d->m_ReleaseList; m_d->m_ReleaseList=0; - delete m_d->m_RelationList; - m_d->m_RelationList=0; + delete m_d->m_RelationListList; + m_d->m_RelationListList=0; delete m_d->m_TagList; m_d->m_TagList=0; @@ -151,6 +164,9 @@ delete m_d->m_UserRating; m_d->m_UserRating=0; + + delete m_d->m_SecondaryTypeList; + m_d->m_SecondaryTypeList=0; } MusicBrainz4::CReleaseGroup *MusicBrainz4::CReleaseGroup::Clone() @@ -158,10 +174,8 @@ return new CReleaseGroup(*this); } -bool MusicBrainz4::CReleaseGroup::ParseAttribute(const std::string& Name, const std::string& Value) +void MusicBrainz4::CReleaseGroup::ParseAttribute(const std::string& Name, const std::string& Value) { - bool RetVal=true; - if ("id"==Name) m_d->m_ID=Value; else if ("type"==Name) @@ -169,65 +183,65 @@ else { std::cerr << "Unrecognised releasegroup attribute: '" << Name << "'" << std::endl; - RetVal=false; } - - return RetVal; } -bool MusicBrainz4::CReleaseGroup::ParseElement(const XMLNode& Node) +void MusicBrainz4::CReleaseGroup::ParseElement(const XMLNode& Node) { - bool RetVal=true; - std::string NodeName=Node.getName(); - if ("title"==NodeName) - { - RetVal=ProcessItem(Node,m_d->m_Title); + if ("primary-type"==NodeName) + { + ProcessItem(Node,m_d->m_PrimaryType); + } + else if ("title"==NodeName) + { + ProcessItem(Node,m_d->m_Title); } else if ("disambiguation"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Disambiguation); + ProcessItem(Node,m_d->m_Disambiguation); } else if ("first-release-date"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_FirstReleaseDate); + ProcessItem(Node,m_d->m_FirstReleaseDate); } else if ("artist-credit"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_ArtistCredit); + ProcessItem(Node,m_d->m_ArtistCredit); } else if ("release-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_ReleaseList); + ProcessItem(Node,m_d->m_ReleaseList); } else if ("relation-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_RelationList); + ProcessRelationList(Node,m_d->m_RelationListList); } else if ("tag-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_TagList); + ProcessItem(Node,m_d->m_TagList); } else if ("user-tag-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_UserTagList); + ProcessItem(Node,m_d->m_UserTagList); } else if ("rating"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Rating); + ProcessItem(Node,m_d->m_Rating); } else if ("user-rating"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_UserRating); + ProcessItem(Node,m_d->m_UserRating); + } + else if ("secondary-type-list"==NodeName) + { + ProcessItem(Node,m_d->m_SecondaryTypeList); } else { std::cerr << "Unrecognised release group element: '" << NodeName << "'" << std::endl; - RetVal=false; } - - return RetVal; } std::string MusicBrainz4::CReleaseGroup::GetElementName() @@ -245,6 +259,11 @@ return m_d->m_Type; } +std::string MusicBrainz4::CReleaseGroup::PrimaryType() const +{ + return m_d->m_PrimaryType; +} + std::string MusicBrainz4::CReleaseGroup::Title() const { return m_d->m_Title; @@ -272,7 +291,12 @@ MusicBrainz4::CRelationList *MusicBrainz4::CReleaseGroup::RelationList() const { - return m_d->m_RelationList; + return m_d->m_RelationListList?m_d->m_RelationListList->Item(m_d->m_RelationListList->NumItems()-1):0; +} + +MusicBrainz4::CRelationListList *MusicBrainz4::CReleaseGroup::RelationListList() const +{ + return m_d->m_RelationListList; } MusicBrainz4::CTagList *MusicBrainz4::CReleaseGroup::TagList() const @@ -295,6 +319,11 @@ return m_d->m_UserRating; } +MusicBrainz4::CSecondaryTypeList *MusicBrainz4::CReleaseGroup::SecondaryTypeList() const +{ + return m_d->m_SecondaryTypeList; +} + std::ostream& MusicBrainz4::CReleaseGroup::Serialise(std::ostream& os) const { os << "Release group:" << std::endl; @@ -302,7 +331,7 @@ CEntity::Serialise(os); os << "\tID: " << ID() << std::endl; - os << "\tType: " << Type() << std::endl; + os << "\tPrimaryType: " << PrimaryType() << std::endl; os << "\tTitle: " << Title() << std::endl; os << "\tDisambiguation: " << Disambiguation() << std::endl; os << "\tFirst release date: " << FirstReleaseDate() << std::endl; @@ -313,8 +342,8 @@ if (ReleaseList()) os << *ReleaseList() << std::endl; - if (RelationList()) - os << *RelationList() << std::endl; + if (RelationListList()) + os << *RelationListList() << std::endl; if (TagList()) os << *TagList() << std::endl; @@ -328,6 +357,9 @@ if (UserRating()) os << *UserRating() << std::endl; + if (SecondaryTypeList()) + os << *SecondaryTypeList() << std::endl; + return os; } === added file 'src/SecondaryType.cc' --- src/SecondaryType.cc 1970-01-01 00:00:00 +0000 +++ src/SecondaryType.cc 2012-06-25 05:56:21 +0000 @@ -0,0 +1,124 @@ +/* -------------------------------------------------------------------------- + + libmusicbrainz4 - Client library to access MusicBrainz + + Copyright (C) 2012 Andrew Hawkins + + This file is part of libmusicbrainz4. + + This library is free software; you can redistribute it and/or + modify it under the terms of v2 of the GNU Lesser General Public + License as published by the Free Software Foundation. + + libmusicbrainz4 is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this library. If not, see . + + $Id$ + +----------------------------------------------------------------------------*/ + +#include "config.h" +#include "musicbrainz4/defines.h" + +#include "musicbrainz4/SecondaryType.h" + + +class MusicBrainz4::CSecondaryTypePrivate +{ + public: + CSecondaryTypePrivate() + { + } + + std::string m_SecondaryType; +}; + +MusicBrainz4::CSecondaryType::CSecondaryType(const XMLNode& Node) +: CEntity(), + m_d(new CSecondaryTypePrivate) +{ + if (!Node.isEmpty()) + { + //std::cout << "SecondaryType node: " << std::endl << Node.createXMLString(true) << std::endl; + + Parse(Node); + + if (Node.getText()) + ProcessItem(Node,m_d->m_SecondaryType); + } +} + +MusicBrainz4::CSecondaryType::CSecondaryType(const CSecondaryType& Other) +: CEntity(), + m_d(new CSecondaryTypePrivate) +{ + *this=Other; +} + +MusicBrainz4::CSecondaryType& MusicBrainz4::CSecondaryType::operator =(const CSecondaryType& Other) +{ + if (this!=&Other) + { + Cleanup(); + + CEntity::operator =(Other); + + m_d->m_SecondaryType=Other.m_d->m_SecondaryType; + } + + return *this; +} + +MusicBrainz4::CSecondaryType::~CSecondaryType() +{ + Cleanup(); + + delete m_d; +} + +void MusicBrainz4::CSecondaryType::Cleanup() +{ +} + +MusicBrainz4::CSecondaryType *MusicBrainz4::CSecondaryType::Clone() +{ + return new CSecondaryType(*this); +} + +void MusicBrainz4::CSecondaryType::ParseAttribute(const std::string& Name, const std::string& /*Value*/) +{ + std::cerr << "Unrecognised secondary type attribute: '" << Name << "'" << std::endl; +} + +void MusicBrainz4::CSecondaryType::ParseElement(const XMLNode& Node) +{ + std::string NodeName=Node.getName(); + + std::cerr << "Unrecognised secondary type element: '" << NodeName << "'" << std::endl; +} + +std::string MusicBrainz4::CSecondaryType::GetElementName() +{ + return "secondary-type"; +} + +std::string MusicBrainz4::CSecondaryType::SecondaryType() const +{ + return m_d->m_SecondaryType; +} + +std::ostream& MusicBrainz4::CSecondaryType::Serialise(std::ostream& os) const +{ + os << "Secondary Type:" << std::endl; + + CEntity::Serialise(os); + + os << "\tSecondaryType: " << SecondaryType() << std::endl; + + return os; +} === added file 'src/SecondaryTypeList.cc' --- src/SecondaryTypeList.cc 1970-01-01 00:00:00 +0000 +++ src/SecondaryTypeList.cc 2012-06-25 05:56:21 +0000 @@ -0,0 +1,101 @@ +/* -------------------------------------------------------------------------- + + libmusicbrainz4 - Client library to access MusicBrainz + + Copyright (C) 2012 Andrew Hawkins + + This file is part of libmusicbrainz4. + + This library is free software; you can redistribute it and/or + modify it under the terms of v2 of the GNU Lesser General Public + License as published by the Free Software Foundation. + + libmusicbrainz4 is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this library. If not, see . + + $Id$ + +----------------------------------------------------------------------------*/ + +#include "config.h" +#include "musicbrainz4/defines.h" + +#include "musicbrainz4/SecondaryTypeList.h" + +#include "musicbrainz4/SecondaryType.h" + +class MusicBrainz4::CSecondaryTypeListPrivate +{ + public: + CSecondaryTypeListPrivate() + { + } +}; + +MusicBrainz4::CSecondaryTypeList::CSecondaryTypeList(const XMLNode& Node) +: CListImpl(), + m_d(new CSecondaryTypeListPrivate) +{ + if (!Node.isEmpty()) + { + //std::cout << "SecondaryTypeList node: " << std::endl << Node.createXMLString(true) << std::endl; + + Parse(Node); + } +} + +MusicBrainz4::CSecondaryTypeList::CSecondaryTypeList(const CSecondaryTypeList& Other) +: CListImpl(), + m_d(new CSecondaryTypeListPrivate) +{ + *this=Other; +} + +MusicBrainz4::CSecondaryTypeList& MusicBrainz4::CSecondaryTypeList::operator =(const CSecondaryTypeList& Other) +{ + if (this!=&Other) + { + CListImpl::operator =(Other); + } + + return *this; +} + +MusicBrainz4::CSecondaryTypeList::~CSecondaryTypeList() +{ + delete m_d; +} + +MusicBrainz4::CSecondaryTypeList *MusicBrainz4::CSecondaryTypeList::Clone() +{ + return new CSecondaryTypeList(*this); +} + +void MusicBrainz4::CSecondaryTypeList::ParseAttribute(const std::string& Name, const std::string& Value) +{ + CListImpl::ParseAttribute(Name,Value); +} + +void MusicBrainz4::CSecondaryTypeList::ParseElement(const XMLNode& Node) +{ + CListImpl::ParseElement(Node); +} + +std::string MusicBrainz4::CSecondaryTypeList::GetElementName() +{ + return "secondary-type-list"; +} + +std::ostream& MusicBrainz4::CSecondaryTypeList::Serialise(std::ostream& os) const +{ + os << "Secondary type list:" << std::endl; + + CListImpl::Serialise(os); + + return os; +} === modified file 'src/Tag.cc' --- src/Tag.cc 2012-02-01 17:18:10 +0000 +++ src/Tag.cc 2012-06-25 05:56:21 +0000 @@ -18,10 +18,13 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: Tag.cc 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ +#include "config.h" +#include "musicbrainz4/defines.h" + #include "musicbrainz4/Tag.h" class MusicBrainz4::CTagPrivate @@ -78,40 +81,30 @@ return new CTag(*this); } -bool MusicBrainz4::CTag::ParseAttribute(const std::string& Name, const std::string& Value) +void MusicBrainz4::CTag::ParseAttribute(const std::string& Name, const std::string& Value) { - bool RetVal=true; - if ("count"==Name) { - RetVal=ProcessItem(Value,m_d->m_Count); + ProcessItem(Value,m_d->m_Count); } else { std::cerr << "Unrecognised tag attribute: '" << Name << "'" << std::endl; - RetVal=false; } - - return RetVal; } -bool MusicBrainz4::CTag::ParseElement(const XMLNode& Node) +void MusicBrainz4::CTag::ParseElement(const XMLNode& Node) { - bool RetVal=true; - std::string NodeName=Node.getName(); if ("name"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Name); + ProcessItem(Node,m_d->m_Name); } else { std::cerr << "Unrecognised tag element: '" << NodeName << "'" << std::endl; - RetVal=false; } - - return RetVal; } std::string MusicBrainz4::CTag::GetElementName() === modified file 'src/TextRepresentation.cc' --- src/TextRepresentation.cc 2012-02-01 17:18:10 +0000 +++ src/TextRepresentation.cc 2012-06-25 05:56:21 +0000 @@ -18,10 +18,13 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: TextRepresentation.cc 13254 2011-08-09 09:29:20Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ +#include "config.h" +#include "musicbrainz4/defines.h" + #include "musicbrainz4/TextRepresentation.h" class MusicBrainz4::CTextRepresentationPrivate @@ -73,37 +76,27 @@ return new CTextRepresentation(*this); } -bool MusicBrainz4::CTextRepresentation::ParseAttribute(const std::string& Name, const std::string& /*Value*/) +void MusicBrainz4::CTextRepresentation::ParseAttribute(const std::string& Name, const std::string& /*Value*/) { - bool RetVal=true; - std::cerr << "Unrecognised textrepresentation attribute: '" << Name << "'" << std::endl; - RetVal=false; - - return RetVal; } -bool MusicBrainz4::CTextRepresentation::ParseElement(const XMLNode& Node) +void MusicBrainz4::CTextRepresentation::ParseElement(const XMLNode& Node) { - bool RetVal=true; - std::string NodeName=Node.getName(); if ("language"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Language); + ProcessItem(Node,m_d->m_Language); } else if ("script"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Script); + ProcessItem(Node,m_d->m_Script); } else { std::cerr << "Unrecognised textrepresentation element: '" << NodeName << "'" << std::endl; - RetVal=false; } - - return RetVal; } std::string MusicBrainz4::CTextRepresentation::GetElementName() === modified file 'src/Track.cc' --- src/Track.cc 2012-02-01 17:18:10 +0000 +++ src/Track.cc 2012-06-25 05:56:21 +0000 @@ -18,10 +18,13 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: Track.cc 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ +#include "config.h" +#include "musicbrainz4/defines.h" + #include "musicbrainz4/Track.h" #include "musicbrainz4/Recording.h" @@ -43,6 +46,7 @@ CRecording *m_Recording; int m_Length; CArtistCredit *m_ArtistCredit; + std::string m_Number; }; MusicBrainz4::CTrack::CTrack(const XMLNode& Node) @@ -82,6 +86,8 @@ if (Other.m_d->m_ArtistCredit) m_d->m_ArtistCredit=new CArtistCredit(*Other.m_d->m_ArtistCredit); + + m_d->m_Number=Other.m_d->m_Number; } return *this; @@ -108,49 +114,43 @@ return new CTrack(*this); } -bool MusicBrainz4::CTrack::ParseAttribute(const std::string& Name, const std::string& /*Value*/) +void MusicBrainz4::CTrack::ParseAttribute(const std::string& Name, const std::string& /*Value*/) { - bool RetVal=true; - std::cerr << "Unrecognised track attribute: '" << Name << "'" << std::endl; - RetVal=false; - - return RetVal; } -bool MusicBrainz4::CTrack::ParseElement(const XMLNode& Node) +void MusicBrainz4::CTrack::ParseElement(const XMLNode& Node) { - bool RetVal=true; - std::string NodeName=Node.getName(); if ("position"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Position); + ProcessItem(Node,m_d->m_Position); } else if ("title"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Title); + ProcessItem(Node,m_d->m_Title); } else if ("recording"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Recording); + ProcessItem(Node,m_d->m_Recording); } else if ("length"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Length); + ProcessItem(Node,m_d->m_Length); } else if ("artist-credit"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_ArtistCredit); + ProcessItem(Node,m_d->m_ArtistCredit); + } + else if ("number"==NodeName) + { + ProcessItem(Node,m_d->m_Number); } else { std::cerr << "Unrecognised track element: '" << NodeName << "'" << std::endl; - RetVal=false; } - - return RetVal; } std::string MusicBrainz4::CTrack::GetElementName() @@ -183,6 +183,11 @@ return m_d->m_ArtistCredit; } +std::string MusicBrainz4::CTrack::Number() const +{ + return m_d->m_Number; +} + std::ostream& MusicBrainz4::CTrack::Serialise(std::ostream& os) const { os << "Track:" << std::endl; @@ -200,5 +205,7 @@ if (ArtistCredit()) os << *ArtistCredit() << std::endl; + os << "\tNumber: " << Number() << std::endl; + return os; } === modified file 'src/UserRating.cc' --- src/UserRating.cc 2012-02-01 17:18:10 +0000 +++ src/UserRating.cc 2012-06-25 05:56:21 +0000 @@ -18,10 +18,13 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: UserRating.cc 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ +#include "config.h" +#include "musicbrainz4/defines.h" + #include "musicbrainz4/UserRating.h" class MusicBrainz4::CUserRatingPrivate @@ -81,26 +84,16 @@ return new CUserRating(*this); } -bool MusicBrainz4::CUserRating::ParseAttribute(const std::string& Name, const std::string& /*Value*/) +void MusicBrainz4::CUserRating::ParseAttribute(const std::string& Name, const std::string& /*Value*/) { - bool RetVal=true; - std::cerr << "Unrecognised userrating attribute: '" << Name << "'" << std::endl; - RetVal=false; - - return RetVal; } -bool MusicBrainz4::CUserRating::ParseElement(const XMLNode& Node) +void MusicBrainz4::CUserRating::ParseElement(const XMLNode& Node) { - bool RetVal=true; - std::string Name=Node.getName(); std::cerr << "Unrecognised userrating element: '" << Name << "'" << std::endl; - RetVal=false; - - return RetVal; } std::string MusicBrainz4::CUserRating::GetElementName() === modified file 'src/UserTag.cc' --- src/UserTag.cc 2012-02-01 17:18:10 +0000 +++ src/UserTag.cc 2012-06-25 05:56:21 +0000 @@ -18,10 +18,13 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: UserTag.cc 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ +#include "config.h" +#include "musicbrainz4/defines.h" + #include "musicbrainz4/UserTag.h" class MusicBrainz4::CUserTagPrivate @@ -71,33 +74,23 @@ return new CUserTag(*this); } -bool MusicBrainz4::CUserTag::ParseAttribute(const std::string& Name, const std::string& /*Value*/) +void MusicBrainz4::CUserTag::ParseAttribute(const std::string& Name, const std::string& /*Value*/) { - bool RetVal=true; - std::cerr << "Unrecognised usertag attribute: '" << Name << "'" << std::endl; - RetVal=false; - - return RetVal; } -bool MusicBrainz4::CUserTag::ParseElement(const XMLNode& Node) +void MusicBrainz4::CUserTag::ParseElement(const XMLNode& Node) { - bool RetVal=true; - std::string NodeName=Node.getName(); if ("name"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Name); + ProcessItem(Node,m_d->m_Name); } else { std::cerr << "Unrecognised UserTag element: '" << NodeName << "'" << std::endl; - RetVal=false; } - - return RetVal; } std::string MusicBrainz4::CUserTag::GetElementName() === modified file 'src/Work.cc' --- src/Work.cc 2012-02-01 17:18:10 +0000 +++ src/Work.cc 2012-06-25 05:56:21 +0000 @@ -18,30 +18,37 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: Work.cc 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ +#include "config.h" +#include "musicbrainz4/defines.h" + #include "musicbrainz4/Work.h" #include "musicbrainz4/ArtistCredit.h" #include "musicbrainz4/AliasList.h" #include "musicbrainz4/Alias.h" #include "musicbrainz4/RelationList.h" +#include "musicbrainz4/RelationListList.h" #include "musicbrainz4/TagList.h" #include "musicbrainz4/Tag.h" #include "musicbrainz4/UserTagList.h" #include "musicbrainz4/UserTag.h" #include "musicbrainz4/Rating.h" #include "musicbrainz4/UserRating.h" +#include "musicbrainz4/ISWC.h" +#include "musicbrainz4/ISWCList.h" class MusicBrainz4::CWorkPrivate { public: CWorkPrivate() : m_ArtistCredit(0), + m_ISWCList(0), m_AliasList(0), - m_RelationList(0), + m_RelationListList(0), m_TagList(0), m_UserTagList(0), m_Rating(0), @@ -53,14 +60,15 @@ std::string m_Type; std::string m_Title; CArtistCredit *m_ArtistCredit; - std::string m_ISWC; + CISWCList *m_ISWCList; std::string m_Disambiguation; CAliasList *m_AliasList; - CRelationList *m_RelationList; + CRelationListList *m_RelationListList; CTagList *m_TagList; CUserTagList *m_UserTagList; CRating *m_Rating; CUserRating *m_UserRating; + std::string m_Language; }; MusicBrainz4::CWork::CWork(const XMLNode& Node) @@ -97,14 +105,16 @@ if (Other.m_d->m_ArtistCredit) m_d->m_ArtistCredit=new CArtistCredit(*Other.m_d->m_ArtistCredit); - m_d->m_ISWC=Other.m_d->m_ISWC; + if (Other.m_d->m_ISWCList) + m_d->m_ISWCList=new CISWCList(*Other.m_d->m_ISWCList); + m_d->m_Disambiguation=Other.m_d->m_Disambiguation; if (Other.m_d->m_AliasList) m_d->m_AliasList=new CAliasList(*Other.m_d->m_AliasList); - if (Other.m_d->m_RelationList) - m_d->m_RelationList=new CRelationList(*Other.m_d->m_RelationList); + if (Other.m_d->m_RelationListList) + m_d->m_RelationListList=new CRelationListList(*Other.m_d->m_RelationListList); if (Other.m_d->m_TagList) m_d->m_TagList=new CTagList(*Other.m_d->m_TagList); @@ -117,6 +127,8 @@ if (Other.m_d->m_UserRating) m_d->m_UserRating=new CUserRating(*Other.m_d->m_UserRating); + + m_d->m_Language=Other.m_d->m_Language; } return *this; @@ -134,11 +146,14 @@ delete m_d->m_ArtistCredit; m_d->m_ArtistCredit=0; + delete m_d->m_ISWCList; + m_d->m_ISWCList=0; + delete m_d->m_AliasList; m_d->m_AliasList=0; - delete m_d->m_RelationList; - m_d->m_RelationList=0; + delete m_d->m_RelationListList; + m_d->m_RelationListList=0; delete m_d->m_TagList; m_d->m_TagList=0; @@ -158,76 +173,68 @@ return new CWork(*this); } -bool MusicBrainz4::CWork::ParseAttribute(const std::string& Name, const std::string& Value) +void MusicBrainz4::CWork::ParseAttribute(const std::string& Name, const std::string& Value) { - bool RetVal=true; - if ("id"==Name) m_d->m_ID=Value; else if ("type"==Name) m_d->m_Type=Value; else - { std::cerr << "Unrecognised work attribute: '" << Name << "'" << std::endl; - RetVal=false; - } - - return RetVal; } -bool MusicBrainz4::CWork::ParseElement(const XMLNode& Node) +void MusicBrainz4::CWork::ParseElement(const XMLNode& Node) { - bool RetVal=true; - std::string NodeName=Node.getName(); if ("title"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Title); + ProcessItem(Node,m_d->m_Title); } else if ("artist-credit"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_ArtistCredit); + ProcessItem(Node,m_d->m_ArtistCredit); } - else if ("iswc"==NodeName) + else if ("iswc-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_ISWC); + ProcessItem(Node,m_d->m_ISWCList); } else if ("disambiguation"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Disambiguation); + ProcessItem(Node,m_d->m_Disambiguation); } else if ("alias-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_AliasList); + ProcessItem(Node,m_d->m_AliasList); } else if ("relation-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_RelationList); + ProcessRelationList(Node,m_d->m_RelationListList); } else if ("tag-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_TagList); + ProcessItem(Node,m_d->m_TagList); } else if ("user-tag-list"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_UserTagList); + ProcessItem(Node,m_d->m_UserTagList); } else if ("rating"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_Rating); + ProcessItem(Node,m_d->m_Rating); } else if ("user-rating"==NodeName) { - RetVal=ProcessItem(Node,m_d->m_UserRating); + ProcessItem(Node,m_d->m_UserRating); + } + else if ("language"==NodeName) + { + ProcessItem(Node,m_d->m_Language); } else { std::cerr << "Unrecognised work element: '" << NodeName << "'" << std::endl; - RetVal=false; } - - return RetVal; } std::string MusicBrainz4::CWork::GetElementName() @@ -257,7 +264,17 @@ std::string MusicBrainz4::CWork::ISWC() const { - return m_d->m_ISWC; + std::string RetISWC; + + if (m_d && m_d->m_ISWCList && m_d->m_ISWCList->NumItems()!=0) + RetISWC=m_d->m_ISWCList->Item(0)->ISWC(); + + return RetISWC; +} + +MusicBrainz4::CISWCList *MusicBrainz4::CWork::ISWCList() const +{ + return m_d->m_ISWCList; } std::string MusicBrainz4::CWork::Disambiguation() const @@ -272,7 +289,12 @@ MusicBrainz4::CRelationList *MusicBrainz4::CWork::RelationList() const { - return m_d->m_RelationList; + return m_d->m_RelationListList?m_d->m_RelationListList->Item(m_d->m_RelationListList->NumItems()-1):0; +} + +MusicBrainz4::CRelationListList *MusicBrainz4::CWork::RelationListList() const +{ + return m_d->m_RelationListList; } MusicBrainz4::CTagList *MusicBrainz4::CWork::TagList() const @@ -295,6 +317,11 @@ return m_d->m_UserRating; } +std::string MusicBrainz4::CWork::Language() const +{ + return m_d->m_Language; +} + std::ostream& MusicBrainz4::CWork::Serialise(std::ostream& os) const { os << "Work:" << std::endl; @@ -308,14 +335,16 @@ if (ArtistCredit()) os << ArtistCredit() << std::endl; - os << "\tISWC: " << ISWC() << std::endl; + if (ISWCList()) + os << ISWCList() << std::endl; + os << "\tDisambiguation: " << Disambiguation() << std::endl; if (AliasList()) os << AliasList() << std::endl; - if (RelationList()) - os << RelationList() << std::endl; + if (RelationListList()) + os << RelationListList() << std::endl; if (TagList()) os << TagList() << std::endl; @@ -329,6 +358,8 @@ if (UserRating()) os << UserRating() << std::endl; + os << "\tLanguage: " << Language() << std::endl; + return os; } === modified file 'src/c-int-medium-defines.inc' --- src/c-int-medium-defines.inc 2012-02-01 17:18:10 +0000 +++ src/c-int-medium-defines.inc 2012-06-25 05:56:21 +0000 @@ -10,7 +10,7 @@ modify it under the terms of v2 of the GNU Lesser General Public License as published by the Free Software Foundation. - Flactag is distributed in the hope that it will be useful, + libmusicbrainz4 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: c-int-medium-defines.inc 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ === modified file 'src/c-int-medium-source.inc' --- src/c-int-medium-source.inc 2012-02-01 17:18:10 +0000 +++ src/c-int-medium-source.inc 2012-06-25 05:56:21 +0000 @@ -10,7 +10,7 @@ modify it under the terms of v2 of the GNU Lesser General Public License as published by the Free Software Foundation. - Flactag is distributed in the hope that it will be useful, + libmusicbrainz4 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: c-int-medium-source.inc 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ === modified file 'src/c-int-query-defines.inc' --- src/c-int-query-defines.inc 2012-02-01 17:18:10 +0000 +++ src/c-int-query-defines.inc 2012-06-25 05:56:21 +0000 @@ -10,7 +10,7 @@ modify it under the terms of v2 of the GNU Lesser General Public License as published by the Free Software Foundation. - Flactag is distributed in the hope that it will be useful, + libmusicbrainz4 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: c-int-query-defines.inc 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ === modified file 'src/c-int-query-source.inc' --- src/c-int-query-source.inc 2012-02-01 17:18:10 +0000 +++ src/c-int-query-source.inc 2012-06-25 05:56:21 +0000 @@ -10,7 +10,7 @@ modify it under the terms of v2 of the GNU Lesser General Public License as published by the Free Software Foundation. - Flactag is distributed in the hope that it will be useful, + libmusicbrainz4 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: c-int-query-source.inc 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ === modified file 'src/c-int-release-defines.inc' --- src/c-int-release-defines.inc 2012-02-01 17:18:10 +0000 +++ src/c-int-release-defines.inc 2012-06-25 05:56:21 +0000 @@ -10,7 +10,7 @@ modify it under the terms of v2 of the GNU Lesser General Public License as published by the Free Software Foundation. - Flactag is distributed in the hope that it will be useful, + libmusicbrainz4 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: c-int-release-defines.inc 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ === modified file 'src/c-int-release-source.inc' --- src/c-int-release-source.inc 2012-02-01 17:18:10 +0000 +++ src/c-int-release-source.inc 2012-06-25 05:56:21 +0000 @@ -10,7 +10,7 @@ modify it under the terms of v2 of the GNU Lesser General Public License as published by the Free Software Foundation. - Flactag is distributed in the hope that it will be useful, + libmusicbrainz4 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: c-int-release-source.inc 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ === modified file 'src/c-int-source-funcs.inc' --- src/c-int-source-funcs.inc 2012-02-01 17:18:10 +0000 +++ src/c-int-source-funcs.inc 2012-06-25 05:56:21 +0000 @@ -10,7 +10,7 @@ modify it under the terms of v2 of the GNU Lesser General Public License as published by the Free Software Foundation. - Flactag is distributed in the hope that it will be useful, + libmusicbrainz4 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. @@ -18,10 +18,14 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: c-int-source-funcs.inc 13254 2011-08-09 09:29:20Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ +#include "musicbrainz4/defines.h" + +#include "musicbrainz4/Query.h" + #include "musicbrainz4/mb4_c.h" #include @@ -43,8 +47,11 @@ #include "musicbrainz4/DiscList.h" #include "musicbrainz4/FreeDBDisc.h" #include "musicbrainz4/FreeDBDiscList.h" +#include "musicbrainz4/IPI.h" #include "musicbrainz4/ISRC.h" #include "musicbrainz4/ISRCList.h" +#include "musicbrainz4/ISWC.h" +#include "musicbrainz4/ISWCList.h" #include "musicbrainz4/Label.h" #include "musicbrainz4/LabelList.h" #include "musicbrainz4/LabelInfo.h" @@ -60,15 +67,17 @@ #include "musicbrainz4/NonMBTrackList.h" #include "musicbrainz4/PUID.h" #include "musicbrainz4/PUIDList.h" -#include "musicbrainz4/Query.h" #include "musicbrainz4/Rating.h" #include "musicbrainz4/Recording.h" #include "musicbrainz4/RecordingList.h" #include "musicbrainz4/Relation.h" #include "musicbrainz4/RelationList.h" +#include "musicbrainz4/RelationListList.h" #include "musicbrainz4/Release.h" #include "musicbrainz4/ReleaseGroup.h" #include "musicbrainz4/ReleaseGroupList.h" +#include "musicbrainz4/SecondaryType.h" +#include "musicbrainz4/SecondaryTypeList.h" #include "musicbrainz4/Tag.h" #include "musicbrainz4/TagList.h" #include "musicbrainz4/TextRepresentation.h" === modified file 'src/cinterface.xml' --- src/cinterface.xml 2012-02-01 17:18:10 +0000 +++ src/cinterface.xml 2012-06-25 05:56:21 +0000 @@ -11,7 +11,7 @@ modify it under the terms of v2 of the GNU Lesser General Public License as published by the Free Software Foundation. - Flactag is distributed in the hope that it will be useful, + libmusicbrainz4 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: cinterface.xml 13385 2012-01-15 15:19:56Z adhawkins $ + $Id$ ---------------------------------------------------------------------------- --> @@ -45,6 +45,8 @@ #ifndef _MUSICBRAINZ4_MB_C_H #define _MUSICBRAINZ4_MB_C_H +#include "musicbrainz4/defines.h" + #ifdef __cplusplus extern "C" { @@ -56,6 +58,11 @@ + + + + + @@ -71,6 +78,7 @@ + @@ -78,7 +86,7 @@ - + @@ -117,22 +125,29 @@ + + + + + + + - + @@ -145,6 +160,7 @@ + @@ -209,6 +225,7 @@ + @@ -225,7 +242,7 @@ - + @@ -261,24 +278,29 @@ - + - + + - + + + + + @@ -294,6 +316,7 @@ + @@ -306,14 +329,15 @@ - + - + + @@ -323,7 +347,9 @@ + + @@ -336,8 +362,10 @@ + + === modified file 'src/make-c-interface.cc' --- src/make-c-interface.cc 2012-02-01 17:18:10 +0000 +++ src/make-c-interface.cc 2012-06-25 05:56:21 +0000 @@ -10,7 +10,7 @@ modify it under the terms of v2 of the GNU Lesser General Public License as published by the Free Software Foundation. - Flactag is distributed in the hope that it will be useful, + libmusicbrainz4 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. @@ -18,10 +18,13 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: make-c-interface.cc 13259 2011-08-10 12:02:50Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ +#include "config.h" +#include "musicbrainz4/defines.h" + #include #include #include @@ -312,16 +315,46 @@ if ("string"==PropertyType) { + bool Deprecated=false; + std::string Replacement; + + if (ChildNode.isAttributeSet("deprecated")) + { + std::string StrDeprecated=ChildNode.getAttribute("deprecated"); + + if (StrDeprecated=="true") + Deprecated=true; + + if (ChildNode.isAttributeSet("replacement")) + Replacement=ChildNode.getAttribute("replacement"); + } + Include << "/**" << std::endl; - Include << " * @see MusicBrainz4::C" << UpperName << "::" << PropertyUpperName << std::endl; + Include << " * "; + if (Deprecated) + Include << "@deprecated "; + + Include << "@see MusicBrainz4::C" << UpperName << "::" << PropertyUpperName << std::endl; Include << " *" << std::endl; + + if (Deprecated) + { + Include << " * This method is deprecated, please use #" << Replacement << "" << std::endl; + Include << " *" << std::endl; + } + Include << " * @param " << UpperName << " #Mb4" << UpperName << " object" << std::endl; Include << " * @param str Returned string" << std::endl; Include << " * @param len Number of characters available in return string" << std::endl; Include << " *" << std::endl; Include << " * @return The number of characters in the string to copy (not including terminating NULL)" << std::endl; Include << " */" << std::endl; - Include << " int mb4_" << LowerName << "_get_" << PropertyLowerName << "(Mb4" << UpperName << " " << UpperName << ", char *str, int len);" << std::endl; + Include << " "; + + if (Deprecated) + Include << "LIBMB4_DEPRECATED(" << Replacement << ") "; + + Include << "int mb4_" << LowerName << "_get_" << PropertyLowerName << "(Mb4" << UpperName << " " << UpperName << ", char *str, int len);" << std::endl; Include << std::endl; Source << " MB4_C_STR_GETTER(" << UpperName << "," << LowerName << "," << PropertyUpperName << "," << PropertyLowerName << ")" << std::endl; @@ -368,6 +401,94 @@ Source << " MB4_C_OBJ_GETTER(" << UpperName << "," << LowerName << "," << PropertyUpperName << "," << PropertyLowerName << ")" << std::endl; } + else if ("relationlist"==PropertyType) + { + Include << "/**" << std::endl; + Include << " * @deprecated @see MusicBrainz4::C" << UpperName << "::" << PropertyUpperName << std::endl; + Include << " *" << std::endl; + Include << " * This method is deprecated, please use #mb4_" << LowerName << "_get_" << PropertyLowerName << "list" << std::endl; + Include << " *" << std::endl; + Include << " * @param " << UpperName << " #Mb4" << UpperName << " object" << std::endl; + Include << " *" << std::endl; + Include << " * @return #Mb4" << PropertyUpperName << " object" << std::endl; + Include << " */" << std::endl; + Include << " LIBMB4_DEPRECATED(mb4_" << LowerName << "_get_" << PropertyLowerName << "list) Mb4" << PropertyUpperName << " mb4_" << LowerName << "_get_" << PropertyLowerName << "(Mb4" << UpperName << " " << UpperName << ");" << std::endl; + Include << std::endl; + + Source << " MB4_C_OBJ_GETTER(" << UpperName << "," << LowerName << "," << PropertyUpperName << "," << PropertyLowerName << ")" << std::endl; + + Include << "/**" << std::endl; + Include << " * @see MusicBrainz4::C" << UpperName << "::" << PropertyUpperName << "List" << std::endl; + Include << " *" << std::endl; + Include << " * @param " << UpperName << " #Mb4" << UpperName << "List object" << std::endl; + Include << " *" << std::endl; + Include << " * @return #Mb4" << PropertyUpperName << "List object" << std::endl; + Include << " */" << std::endl; + Include << " Mb4" << PropertyUpperName << "List mb4_" << LowerName << "_get_" << PropertyLowerName << "list(Mb4" << UpperName << " " << UpperName << ");" << std::endl; + Include << std::endl; + + Source << " MB4_C_OBJ_GETTER(" << UpperName << "," << LowerName << "," << PropertyUpperName << "List," << PropertyLowerName << "list)" << std::endl; + } + else if ("iswc"==PropertyType) + { + Include << "/**" << std::endl; + Include << " * @deprecated @see MusicBrainz4::C" << UpperName << "::" << PropertyUpperName << std::endl; + Include << " *" << std::endl; + Include << " * This method is deprecated, please use #mb4_" << LowerName << "_get_" << PropertyLowerName << "list" << std::endl; + Include << " *" << std::endl; + Include << " * @param " << UpperName << " #Mb4" << UpperName << " object" << std::endl; + Include << " * @param str Returned string" << std::endl; + Include << " * @param len Number of characters available in return string" << std::endl; + Include << " *" << std::endl; + Include << " * @return The number of characters in the string to copy (not including terminating NULL)" << std::endl; + Include << " */" << std::endl; + Include << " LIBMB4_DEPRECATED(mb4_" << LowerName << "_get_" << PropertyLowerName << "list) int mb4_" << LowerName << "_get_" << PropertyLowerName << "(Mb4" << UpperName << " " << UpperName << ", char *str, int len);" << std::endl; + Include << std::endl; + + Source << " MB4_C_STR_GETTER(" << UpperName << "," << LowerName << "," << PropertyUpperName << "," << PropertyLowerName << ")" << std::endl; + + Include << "/**" << std::endl; + Include << " * @see MusicBrainz4::C" << UpperName << "::" << PropertyUpperName << "List" << std::endl; + Include << " *" << std::endl; + Include << " * @param " << UpperName << " #Mb4" << UpperName << "List object" << std::endl; + Include << " *" << std::endl; + Include << " * @return #Mb4" << PropertyUpperName << "List object" << std::endl; + Include << " */" << std::endl; + Include << " Mb4" << PropertyUpperName << "List mb4_" << LowerName << "_get_" << PropertyLowerName << "list(Mb4" << UpperName << " " << UpperName << ");" << std::endl; + Include << std::endl; + + Source << " MB4_C_OBJ_GETTER(" << UpperName << "," << LowerName << "," << PropertyUpperName << "List," << PropertyLowerName << "list)" << std::endl; + } + else if ("ipi"==PropertyType) + { + Include << "/**" << std::endl; + Include << " * @deprecated @see MusicBrainz4::C" << UpperName << "::" << PropertyUpperName << std::endl; + Include << " *" << std::endl; + Include << " * This method is deprecated, please use #mb4_" << LowerName << "_get_" << PropertyLowerName << "list" << std::endl; + Include << " *" << std::endl; + Include << " * @param " << UpperName << " #Mb4" << UpperName << " object" << std::endl; + Include << " * @param str Returned string" << std::endl; + Include << " * @param len Number of characters available in return string" << std::endl; + Include << " *" << std::endl; + Include << " * @return The number of characters in the string to copy (not including terminating NULL)" << std::endl; + Include << " */" << std::endl; + Include << " LIBMB4_DEPRECATED(mb4_" << LowerName << "_get_" << PropertyLowerName << "list) int mb4_" << LowerName << "_get_" << PropertyLowerName << "(Mb4" << UpperName << " " << UpperName << ", char *str, int len);" << std::endl; + Include << std::endl; + + Source << " MB4_C_STR_GETTER(" << UpperName << "," << LowerName << "," << PropertyUpperName << "," << PropertyLowerName << ")" << std::endl; + + Include << "/**" << std::endl; + Include << " * @see MusicBrainz4::C" << UpperName << "::" << PropertyUpperName << "List" << std::endl; + Include << " *" << std::endl; + Include << " * @param " << UpperName << " #Mb4" << UpperName << "List object" << std::endl; + Include << " *" << std::endl; + Include << " * @return #Mb4" << PropertyUpperName << "List object" << std::endl; + Include << " */" << std::endl; + Include << " Mb4" << PropertyUpperName << "List mb4_" << LowerName << "_get_" << PropertyLowerName << "list(Mb4" << UpperName << " " << UpperName << ");" << std::endl; + Include << std::endl; + + Source << " MB4_C_OBJ_GETTER(" << UpperName << "," << LowerName << "," << PropertyUpperName << "List," << PropertyLowerName << "list)" << std::endl; + } else { std::cerr << "Unexpected property type: '" << PropertyType << "'" << std::endl; === removed directory 'test-data' === removed file 'test-data/README' --- test-data/README 2012-02-01 17:18:10 +0000 +++ test-data/README 1970-01-01 00:00:00 +0000 @@ -1,13 +0,0 @@ -MusicBrainz Web Service XML Examples ------------------------------------- - -This directory contains example XML code for testing an implementation. - -Implementations MUST be able to parse the XML in the 'valid' directory. -It is perfect, schema-compliant XML. - -The 'invalid' directory contains all kinds of invalid XML. Implementations -are not expected to parse those files. They MAY, however. - --- -$Id: README 33 2006-01-30 09:50:19Z matt $ === removed directory 'test-data/invalid' === removed directory 'test-data/invalid/artist' === removed file 'test-data/invalid/artist/basic_1.xml' --- test-data/invalid/artist/basic_1.xml 2012-02-01 17:18:10 +0000 +++ test-data/invalid/artist/basic_1.xml 1970-01-01 00:00:00 +0000 @@ -1,12 +0,0 @@ - - - - - - - - - - - - === removed file 'test-data/invalid/artist/basic_2.xml' --- test-data/invalid/artist/basic_2.xml 2012-02-01 17:18:10 +0000 +++ test-data/invalid/artist/basic_2.xml 1970-01-01 00:00:00 +0000 @@ -1,12 +0,0 @@ - - - - - - - - - - - - === removed file 'test-data/invalid/artist/empty_1.xml' === removed file 'test-data/invalid/artist/empty_2.xml' --- test-data/invalid/artist/empty_2.xml 2012-02-01 17:18:10 +0000 +++ test-data/invalid/artist/empty_2.xml 1970-01-01 00:00:00 +0000 @@ -1,3 +0,0 @@ - - - === removed file 'test-data/invalid/artist/empty_3.xml' --- test-data/invalid/artist/empty_3.xml 2012-02-01 17:18:10 +0000 +++ test-data/invalid/artist/empty_3.xml 1970-01-01 00:00:00 +0000 @@ -1,7 +0,0 @@ - - - - - - - === removed file 'test-data/invalid/artist/ratings_1.xml' --- test-data/invalid/artist/ratings_1.xml 2012-02-01 17:18:10 +0000 +++ test-data/invalid/artist/ratings_1.xml 1970-01-01 00:00:00 +0000 @@ -1,6 +0,0 @@ - - - - 2 - - === removed file 'test-data/invalid/artist/ratings_2.xml' --- test-data/invalid/artist/ratings_2.xml 2012-02-01 17:18:10 +0000 +++ test-data/invalid/artist/ratings_2.xml 1970-01-01 00:00:00 +0000 @@ -1,6 +0,0 @@ - - - - 2.5 - - === removed file 'test-data/invalid/artist/search_result_1.xml' --- test-data/invalid/artist/search_result_1.xml 2012-02-01 17:18:10 +0000 +++ test-data/invalid/artist/search_result_1.xml 1970-01-01 00:00:00 +0000 @@ -1,11 +0,0 @@ - - - - - - Tori Amos - Amos, Tori - - - - === removed file 'test-data/invalid/artist/tags_1.xml' --- test-data/invalid/artist/tags_1.xml 2012-02-01 17:18:10 +0000 +++ test-data/invalid/artist/tags_1.xml 1970-01-01 00:00:00 +0000 @@ -1,6 +0,0 @@ - - - - foo - - === removed directory 'test-data/invalid/release' === removed directory 'test-data/invalid/track' === removed directory 'test-data/valid' === removed directory 'test-data/valid/artist' === removed file 'test-data/valid/artist/Tchaikovsky-1.xml' --- test-data/valid/artist/Tchaikovsky-1.xml 2012-02-01 17:18:10 +0000 +++ test-data/valid/artist/Tchaikovsky-1.xml 1970-01-01 00:00:00 +0000 @@ -1,90 +0,0 @@ - - - - Пётр Ильич Чайковский - Tchaikovsky, Pyotr Ilyich - - - Tchaikovsky - Peter Ilyich Tchaikovsky - Peter Tchaikovsky - Tschaikowsky - Peter Tschaikowsky - Piotr Ilyich Tchaikovsky - Piotr Tchaikovsky - Peter Iljitsch Tschaikowsky - Tchaikovsky, Peter Ilyich - Peter Ilyitch Tchaikovsky - Pjotr Ilyich Tchaikovsky - Peter I. Tschaikowsky - Pyotr Tchaikovsky - P. I. Tchaikovsky - Peter Ilich Tchaikovsky - Tchaikovsky, P.I. - Tsjaikovski - Tchaikovsky, Pyotr Ilyich - Tjajkovskij - Piotr Ilyitch Tchaikovsky - Tsjajkovskij - Peter Ilyich Tchaikovski - Peter I. Tchaikovsky - Tchaikovsky, Peter I. - Tchaikowsky - Peter Ilyich Tschaikowsky - Peter Iljitsch Tschaikowski - Pyotr Il'Yich Tchaikovsky - Tchiakovsky, Pyotr Ilich (1840-1893) - Tchaikovsky, Peter Ilyich (1840-93) - Tchaikovsky, Peter Ilyitch - Pyotr Ilyitch Tchaikovsky - Tsaikovski - Pytor Ilyich Tchaikovsky - Piotr Ilyich Tchaikowsky - Tchaikovsky - Philharmonic Orchestra - Peter Iljitsch Tschaikowsky (1840 - 1893) - Peter Tschaikovsky - Peter Ilych Tschaikowsky - Pyotr II'yich Tchaikovsky - Pytor Tchaikovsky - Pyotr Ilyich Tchaikovsky - Чайковский, Петр Ильич - Чайковский, Пётр Ильич - Петр Ильич Чайковский - Пётр Ильич Чайковский - Tchaikovsky, Peter Il'yich - Tchaikovsky, Pjotr Ilyich (1840 - 1893) - Piotr Illitch Tchaïkovsky - Piotr Ilic Ciaikovsky - Pyotr Illyich Tchaikovsky - Tchaikovsky, Piotr Ilich (1840-1893) - Peter Ilyich Tchaikovshy - Pyotr Ilyich Tchaikovsly - Peter Ilych Tchaikovsky - 차이코프스키 - Piotr Ilitch Tchaïkovski - Chaikovsky, P. I. - Pjotr Iljitsch Tschaikowsky - Ciaikosvsky - Tchaikovsky 1841-1893 - Tchaïkovki - Piotr Ilych Chaikovsky - Pjotr Iljitsj Tsjaikovski - Pyotor Ilyich Tschaikovsky - Peter Iljitsj Tsjaikovski - P. I. Tchaikovskij - Piotr Ilich Tchaikovsky - Peter Iljitsch Tchaikovsky - Tchaikovisky - Tchaikovsy - Tchailovisky - Tchaikovskyes - Tchaikovskys - Tchaikoskvy - Piotr Il'yich Tchaikovsky - Tchaikowski - Piotr Iljič Čajkovskij - Tchaikivsky - Pyotor Tchaikovsky - - - === removed file 'test-data/valid/artist/Tchaikovsky-2.xml' --- test-data/valid/artist/Tchaikovsky-2.xml 2012-02-01 17:18:10 +0000 +++ test-data/valid/artist/Tchaikovsky-2.xml 1970-01-01 00:00:00 +0000 @@ -1,18 +0,0 @@ - - - - Пётр Ильич Чайковский - - classical - russian - romantic era - composer - - - classical - russian - - 4.5 - 3 - - === removed file 'test-data/valid/artist/Tori_Amos_1.xml' --- test-data/valid/artist/Tori_Amos_1.xml 2012-02-01 17:18:10 +0000 +++ test-data/valid/artist/Tori_Amos_1.xml 1970-01-01 00:00:00 +0000 @@ -1,8 +0,0 @@ - - - - Tori Amos - Amos, Tori - - - === removed file 'test-data/valid/artist/Tori_Amos_2.xml' --- test-data/valid/artist/Tori_Amos_2.xml 2012-02-01 17:18:10 +0000 +++ test-data/valid/artist/Tori_Amos_2.xml 1970-01-01 00:00:00 +0000 @@ -1,67 +0,0 @@ - - - - Tori Amos - Amos, Tori - - - - Strange Little Girls - B00005NKYQ - - - - - - - - - - - - - - - - - - - To Venus and Back (disc 1: Orbiting) - B00001IVJS - - - - - - - - - - - Under the Pink - B000002IXU - - - - - - - - - - - - - - - Under the Pink - - - To Venus and Back - - - Strange Little Girls - - - - === removed file 'test-data/valid/artist/Tori_Amos_3.xml' --- test-data/valid/artist/Tori_Amos_3.xml 2012-02-01 17:18:10 +0000 +++ test-data/valid/artist/Tori_Amos_3.xml 1970-01-01 00:00:00 +0000 @@ -1,25 +0,0 @@ - - - - Tori Amos - Amos, Tori - - - - - Mark Hawley - Hawley, Mark - - - - - - - - - === removed file 'test-data/valid/artist/Tori_Amos_4.xml' --- test-data/valid/artist/Tori_Amos_4.xml 2012-02-01 17:18:10 +0000 +++ test-data/valid/artist/Tori_Amos_4.xml 1970-01-01 00:00:00 +0000 @@ -1,14 +0,0 @@ - - - - Tori Amos - Amos, Tori - yes, that one - - - Myra Ellen Amos - Myra Amos - Torie Amos - - - === removed file 'test-data/valid/artist/Tori_Amos_5.xml' --- test-data/valid/artist/Tori_Amos_5.xml 2012-02-01 17:18:10 +0000 +++ test-data/valid/artist/Tori_Amos_5.xml 1970-01-01 00:00:00 +0000 @@ -1,13 +0,0 @@ - - - - Tori Amos - Amos, Tori - - - - Strange Little Girls - - - - === removed file 'test-data/valid/artist/empty_1.xml' --- test-data/valid/artist/empty_1.xml 2012-02-01 17:18:10 +0000 +++ test-data/valid/artist/empty_1.xml 1970-01-01 00:00:00 +0000 @@ -1,7 +0,0 @@ - - - - - - - === removed file 'test-data/valid/artist/empty_2.xml' --- test-data/valid/artist/empty_2.xml 2012-02-01 17:18:10 +0000 +++ test-data/valid/artist/empty_2.xml 1970-01-01 00:00:00 +0000 @@ -1,11 +0,0 @@ - - - - - - - - - - - === removed file 'test-data/valid/artist/search_result_1.xml' --- test-data/valid/artist/search_result_1.xml 2012-02-01 17:18:10 +0000 +++ test-data/valid/artist/search_result_1.xml 1970-01-01 00:00:00 +0000 @@ -1,19 +0,0 @@ - - - - - Tori Amos - Amos, Tori - - - - Tori Spelling - Spelling, Tori - - - Lisa And Tori - Lisa And Tori - - - === removed directory 'test-data/valid/label' === removed file 'test-data/valid/label/Atlantic_Records_1.xml' --- test-data/valid/label/Atlantic_Records_1.xml 2012-02-01 17:18:10 +0000 +++ test-data/valid/label/Atlantic_Records_1.xml 1970-01-01 00:00:00 +0000 @@ -1,9 +0,0 @@ - - - - === removed file 'test-data/valid/label/Atlantic_Records_2.xml' --- test-data/valid/label/Atlantic_Records_2.xml 2012-02-01 17:18:10 +0000 +++ test-data/valid/label/Atlantic_Records_2.xml 1970-01-01 00:00:00 +0000 @@ -1,14 +0,0 @@ - - - - === removed file 'test-data/valid/label/Atlantic_Records_3.xml' --- test-data/valid/label/Atlantic_Records_3.xml 2012-02-01 17:18:10 +0000 +++ test-data/valid/label/Atlantic_Records_3.xml 1970-01-01 00:00:00 +0000 @@ -1,17 +0,0 @@ - - - - === removed file 'test-data/valid/label/search_result_1.xml' --- test-data/valid/label/search_result_1.xml 2012-02-01 17:18:10 +0000 +++ test-data/valid/label/search_result_1.xml 1970-01-01 00:00:00 +0000 @@ -1,14 +0,0 @@ - - - - - - - === removed directory 'test-data/valid/release' === removed directory 'test-data/valid/release-group' === removed file 'test-data/valid/release-group/The_Cure_1.xml' --- test-data/valid/release-group/The_Cure_1.xml 2012-02-01 17:18:10 +0000 +++ test-data/valid/release-group/The_Cure_1.xml 1970-01-01 00:00:00 +0000 @@ -1,36 +0,0 @@ - - - - The Cure - - The Cure - Cure, The - - - - - The Cure - - B0002CHGZI - - - - The Cure - - - - - The Cure - - B0002C9G7O - - - - The Cure - - B00028HOFY - - - - - === removed file 'test-data/valid/release-group/search_result_1.xml' --- test-data/valid/release-group/search_result_1.xml 2012-02-01 17:18:10 +0000 +++ test-data/valid/release-group/search_result_1.xml 1970-01-01 00:00:00 +0000 @@ -1,23 +0,0 @@ - - - - - Signal Morning - - Circulatory System - - - - Circulatory System - - Circulatory System - - - - Inside Views - - Circulatory System - - - - === removed file 'test-data/valid/release/Highway_61_Revisited_1.xml' --- test-data/valid/release/Highway_61_Revisited_1.xml 2012-02-01 17:18:10 +0000 +++ test-data/valid/release/Highway_61_Revisited_1.xml 1970-01-01 00:00:00 +0000 @@ -1,68 +0,0 @@ - - - - Highway 61 Revisited - - B0000C8AVR - - Bob Dylan - Dylan, Bob - - - - - - - - - - - - - - - - - - Like a Rolling Stone - 373333 - - - Tombstone Blues - 360533 - - - It Takes a Lot to Laugh, It Takes a Train to Cry - 249066 - - - From a Buick 6 - 199026 - - - Ballad of a Thin Man - 358640 - - - Queen Jane Approximately - 331760 - - - Highway 61 Revisited - 210333 - - - Just Like Tom Thumb's Blues - 332133 - - - Desolation Row - 682506 - - - - - - - - === removed file 'test-data/valid/release/Highway_61_Revisited_2.xml' --- test-data/valid/release/Highway_61_Revisited_2.xml 2012-02-01 17:18:10 +0000 +++ test-data/valid/release/Highway_61_Revisited_2.xml 1970-01-01 00:00:00 +0000 @@ -1,18 +0,0 @@ - - - - Highway 61 Revisited - - rock - blues rock - folk rock - dylan - - - rock - foo - - 4.5 - 3 - - === removed file 'test-data/valid/release/Little_Earthquakes_1.xml' --- test-data/valid/release/Little_Earthquakes_1.xml 2012-02-01 17:18:10 +0000 +++ test-data/valid/release/Little_Earthquakes_1.xml 1970-01-01 00:00:00 +0000 @@ -1,24 +0,0 @@ - - - - Little Earthquakes - - B000002IT2 - - Tori Amos - Amos, Tori - - - - - - - - - - - - - - - === removed file 'test-data/valid/release/Little_Earthquakes_2.xml' --- test-data/valid/release/Little_Earthquakes_2.xml 2012-02-01 17:18:10 +0000 +++ test-data/valid/release/Little_Earthquakes_2.xml 1970-01-01 00:00:00 +0000 @@ -1,73 +0,0 @@ - - - - Little Earthquakes - - B000002IT2 - - Tori Amos - Amos, Tori - - - - - - - - - - - - - - - Crucify - 301186 - - - Girl - 249493 - - - Silent All These Years - 253466 - - - Precious Things - 269293 - - - Winter - 344573 - - - Happy Phantom - 199000 - - - China - 301946 - - - Leather - 193960 - - - Mother - 421173 - - - Tear in Your Hand - 280866 - - - Me and a Gun - 226920 - - - Little Earthquakes - 413693 - - - - === removed file 'test-data/valid/release/Mission_Impossible_2.xml' --- test-data/valid/release/Mission_Impossible_2.xml 2012-02-01 17:18:10 +0000 +++ test-data/valid/release/Mission_Impossible_2.xml 1970-01-01 00:00:00 +0000 @@ -1,155 +0,0 @@ - - - - Mission: Impossible 2 - - - Various Artists - Various Artists - - - - - - - Take a Look Around - 320160 - - Limp Bizkit - Limp Bizkit - - - - - I Disappear - 266306 - - Metallica - Metallica - - - - - Scum of the Earth - 175533 - - Rob Zombie - Zombie, Rob - - - - - They Came In - 282560 - - Butthole Surfers - Butthole Surfers - - - - - Rocket Science - 210466 - - The Pimps - Pimps, The - - - - Have a Cigar (feat. Brian May) - 242933 - - Foo Fighters - Foo Fighters - - - - - Mission 2000 - 222440 - - Chris Cornell - Cornell, Chris - - - - Going Down - 203160 - - Godsmack - Godsmack - - - - - What U Lookin' At? - 312000 - - Uncle Kracker - Uncle Kracker - - - - Backwards - 189506 - - Apartment 26 - Apartment 26 - - - - Karma - 196160 - - Diffuser - Diffuser - - - - Alone - 203973 - - Buckcherry - Buckcherry - - - - - Immune - 229026 - - Tinfed - Tinfed - - - - My Kinda Scene - 266666 - - Powderfinger - Powderfinger - Australian rock band - - - - - Carnival - 258066 - - Tori Amos - Amos, Tori - - - - - Nyah (feat. Heitor Pereira) - 213306 - - Hans Zimmer - Zimmer, Hans - - - - - - === removed file 'test-data/valid/release/Under_the_Pink_1.xml' --- test-data/valid/release/Under_the_Pink_1.xml 2012-02-01 17:18:10 +0000 +++ test-data/valid/release/Under_the_Pink_1.xml 1970-01-01 00:00:00 +0000 @@ -1,16 +0,0 @@ - - - - Under the Pink - - B000002IXU - - Tori Amos - - - - - - - - === removed file 'test-data/valid/release/Under_the_Pink_2.xml' --- test-data/valid/release/Under_the_Pink_2.xml 2012-02-01 17:18:10 +0000 +++ test-data/valid/release/Under_the_Pink_2.xml 1970-01-01 00:00:00 +0000 @@ -1,17 +0,0 @@ - - - - Under the Pink - - Tori Amos - - - Under the Pink - - - - God - - - - === removed file 'test-data/valid/release/Under_the_Pink_3.xml' --- test-data/valid/release/Under_the_Pink_3.xml 2012-02-01 17:18:10 +0000 +++ test-data/valid/release/Under_the_Pink_3.xml 1970-01-01 00:00:00 +0000 @@ -1,16 +0,0 @@ - - - - Under the Pink - - Tori Amos - - - - - - - - === removed file 'test-data/valid/release/search_result_1.xml' --- test-data/valid/release/search_result_1.xml 2012-02-01 17:18:10 +0000 +++ test-data/valid/release/search_result_1.xml 1970-01-01 00:00:00 +0000 @@ -1,29 +0,0 @@ - - - - - - - Under the Pink - - B000002IXU - - Tori Amos - - - - - - - - - Under the Pink Tour 1994 - - - Tori Amos - - - - - === removed directory 'test-data/valid/track' === removed file 'test-data/valid/track/Silent_All_These_Years_1.xml' --- test-data/valid/track/Silent_All_These_Years_1.xml 2012-02-01 17:18:10 +0000 +++ test-data/valid/track/Silent_All_These_Years_1.xml 1970-01-01 00:00:00 +0000 @@ -1,7 +0,0 @@ - - - - Silent All These Years - 253466 - - === removed file 'test-data/valid/track/Silent_All_These_Years_2.xml' --- test-data/valid/track/Silent_All_These_Years_2.xml 2012-02-01 17:18:10 +0000 +++ test-data/valid/track/Silent_All_These_Years_2.xml 1970-01-01 00:00:00 +0000 @@ -1,21 +0,0 @@ - - - - Silent All These Years - 253466 - - Tori Amos - Amos, Tori - - - - - Silent All These Years - - - - - - === removed file 'test-data/valid/track/Silent_All_These_Years_3.xml' --- test-data/valid/track/Silent_All_These_Years_3.xml 2012-02-01 17:18:10 +0000 +++ test-data/valid/track/Silent_All_These_Years_3.xml 1970-01-01 00:00:00 +0000 @@ -1,16 +0,0 @@ - - - - Silent All These Years - 253466 - - - - - - - - - - - === removed file 'test-data/valid/track/Silent_All_These_Years_4.xml' --- test-data/valid/track/Silent_All_These_Years_4.xml 2012-02-01 17:18:10 +0000 +++ test-data/valid/track/Silent_All_These_Years_4.xml 1970-01-01 00:00:00 +0000 @@ -1,33 +0,0 @@ - - - - - Silent All These Years - 253466 - - - - - Tori Amos - Amos, Tori - - - - - Little Earthquakes - - - - - - - - - - - - - - - === removed file 'test-data/valid/track/Silent_All_These_Years_5.xml' --- test-data/valid/track/Silent_All_These_Years_5.xml 2012-02-01 17:18:10 +0000 +++ test-data/valid/track/Silent_All_These_Years_5.xml 1970-01-01 00:00:00 +0000 @@ -1,20 +0,0 @@ - - - - - Silent All These Years - 253466 - - - - - - - - - - - This is a very nice song. - - === removed file 'test-data/valid/track/Silent_All_These_Years_6.xml' --- test-data/valid/track/Silent_All_These_Years_6.xml 2012-02-01 17:18:10 +0000 +++ test-data/valid/track/Silent_All_These_Years_6.xml 1970-01-01 00:00:00 +0000 @@ -1,16 +0,0 @@ - - - - Silent All These Years - 253466 - - - - - - foo - - 4.5 - 3 - - === removed file 'test-data/valid/track/search_result_1.xml' --- test-data/valid/track/search_result_1.xml 2012-02-01 17:18:10 +0000 +++ test-data/valid/track/search_result_1.xml 1970-01-01 00:00:00 +0000 @@ -1,45 +0,0 @@ - - - - - Little Earthquakes - 457760 - - Tori Amos - - - - To Venus and Back (disc 2: Live, Still Orbiting) - - - - - - Little Earthquakes - 413693 - - Tori Amos - - - - Little Earthquakes - - - - - - Little Amsterdam - 270106 - - Tori Amos - - - - Boys for Pele - - - - - - === removed directory 'test-data/valid/user' === removed file 'test-data/valid/user/User_1.xml' --- test-data/valid/user/User_1.xml 2012-02-01 17:18:10 +0000 +++ test-data/valid/user/User_1.xml 1970-01-01 00:00:00 +0000 @@ -1,15 +0,0 @@ - - - - - - - - - matt - - - - - === added file 'tests/.gitignore' --- tests/.gitignore 1970-01-01 00:00:00 +0000 +++ tests/.gitignore 2012-06-25 05:56:21 +0000 @@ -0,0 +1,5 @@ +CMakeFiles/ +Makefile +cmake_install.cmake +ctest +mbtest === modified file 'tests/CMakeLists.txt' --- tests/CMakeLists.txt 2012-02-01 17:18:10 +0000 +++ tests/CMakeLists.txt 2012-06-25 05:56:21 +0000 @@ -4,10 +4,18 @@ ADD_EXECUTABLE(ctest ctest.c) IF(CMAKE_COMPILER_IS_GNUCXX) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -Wextra -pedantic-errors") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic-errors") + IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../.git) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") + ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../.git) ENDIF(CMAKE_COMPILER_IS_GNUCXX) IF(CMAKE_COMPILER_IS_GNUCC) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror -Wextra -pedantic-errors") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -pedantic-errors") + IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../.git) + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror") + ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../.git) + set_source_files_properties(ctest.c PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations") + set_source_files_properties(mbtest.cc PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations") ENDIF(CMAKE_COMPILER_IS_GNUCC) === modified file 'tests/ctest.c' --- tests/ctest.c 2012-02-01 17:18:10 +0000 +++ tests/ctest.c 2012-06-25 05:56:21 +0000 @@ -10,7 +10,7 @@ modify it under the terms of v2 of the GNU Lesser General Public License as published by the Free Software Foundation. - Flactag is distributed in the hope that it will be useful, + libmusicbrainz4 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this library. If not, see . - $Id: ctest.c 13385 2012-01-15 15:19:56Z adhawkins $ + $Id$ ----------------------------------------------------------------------------*/ @@ -28,11 +28,85 @@ #include "musicbrainz4/mb4_c.h" +void PrintRelationList(Mb4RelationList RelationList) +{ + char Type[256]; + int count; + + mb4_relation_list_get_targettype(RelationList,Type,sizeof(Type)); + printf("Target type is '%s'\n",Type); + + for (count=0;count. - - $Id: mbtest.cc 13254 2011-08-09 09:29:20Z adhawkins $ - -----------------------------------------------------------------------------*/ - -#include - -#include - -#include "musicbrainz4/Query.h" -#include "musicbrainz4/Release.h" -#include "musicbrainz4/ReleaseGroup.h" -#include "musicbrainz4/Medium.h" -#include "musicbrainz4/MediumList.h" -#include "musicbrainz4/NameCredit.h" -#include "musicbrainz4/ArtistCredit.h" -#include "musicbrainz4/Artist.h" -#include "musicbrainz4/HTTPFetch.h" -#include "musicbrainz4/Track.h" -#include "musicbrainz4/Recording.h" -#include "musicbrainz4/Collection.h" -#include "musicbrainz4/CollectionList.h" - -int main(int argc, const char *argv[]) -{ - MusicBrainz4::CQuery MB("MBTest/v1.0"); - - if (argc>1) - { - std::cout << "Setting username: '" << argv[1] << "'" << std::endl; - MB.SetUserName(argv[1]); - } - - if (argc>2) - { - std::cout << "Setting password: '" << argv[2] << "'" << std::endl; - MB.SetPassword(argv[2]); - } - - MusicBrainz4::CMetadata Metadata=MB.Query("collection"); - MusicBrainz4::CCollectionList *CollectionList=Metadata.CollectionList(); - if (CollectionList && 0!=CollectionList->NumItems()) - { - MusicBrainz4::CCollection *Collection=CollectionList->Item(0); - std::cout << "ID is " << Collection->ID() << std::endl; - - MB.Query("collection",Collection->ID(),"releases"); - - std::vector Releases; - Releases.push_back("b5748ac9-f38e-48f7-a8a4-8b43cab025bc"); - Releases.push_back("f6335672-c521-4129-86c3-490d20533e08"); - bool Ret=MB.AddCollectionEntries(Collection->ID(),Releases); - std::cout << "AddCollectionEntries returns " << std::boolalpha << Ret << std::endl; - - MB.Query("collection",Collection->ID(),"releases"); - - Releases.clear(); - Releases.push_back("b5748ac9-f38e-48f7-a8a4-8b43cab025bc"); - Ret=MB.DeleteCollectionEntries(Collection->ID(),Releases); - std::cout << "DeleteCollectionEntries returns " << std::boolalpha << Ret << std::endl; - - MB.Query("collection",Collection->ID(),"releases"); - } - - return 0; - - std::string DiscID="arIS30RPWowvwNEqsqdDnZzDGhk-"; - - if (argc==2) - DiscID=argv[1]; - - MusicBrainz4::CReleaseList ReleaseList=MB.LookupDiscID(DiscID); - - for (int count=0;countID()); - - std::cout << "Full release: " << std::endl; - - std::cout << FullRelease << std::endl; - - std::cout << "Release group title: '" << FullRelease.ReleaseGroup()->Title() << "'" << std::endl; - - std::cout << std::endl << std::endl << "Media matching " << DiscID << ":" << std::endl; - - MusicBrainz4::CMediumList MediaList=FullRelease.MediaMatchingDiscID(DiscID); - - for (int count=0;count. + + $Id$ + +----------------------------------------------------------------------------*/ + +#include + +#include + +#include "musicbrainz4/Query.h" +#include "musicbrainz4/Release.h" +#include "musicbrainz4/ReleaseGroup.h" +#include "musicbrainz4/Medium.h" +#include "musicbrainz4/MediumList.h" +#include "musicbrainz4/NameCredit.h" +#include "musicbrainz4/ArtistCredit.h" +#include "musicbrainz4/Artist.h" +#include "musicbrainz4/Alias.h" +#include "musicbrainz4/HTTPFetch.h" +#include "musicbrainz4/Track.h" +#include "musicbrainz4/Recording.h" +#include "musicbrainz4/Collection.h" +#include "musicbrainz4/CollectionList.h" +#include "musicbrainz4/RelationListList.h" +#include "musicbrainz4/RelationList.h" +#include "musicbrainz4/Relation.h" +#include "musicbrainz4/Work.h" +#include "musicbrainz4/ISWC.h" +#include "musicbrainz4/ISWCList.h" +#include "musicbrainz4/SecondaryType.h" +#include "musicbrainz4/SecondaryTypeList.h" +#include "musicbrainz4/IPI.h" +#include "musicbrainz4/IPIList.h" +#include "musicbrainz4/Lifespan.h" + +void PrintRelationList(MusicBrainz4::CRelationList *RelationList) +{ + std::cout << "Target type: '" << RelationList->TargetType() << "'" << std::endl; + + for (int count=0;countNumItems();count++) + { + MusicBrainz4::CRelation *Relation=RelationList->Item(count); + std::cout << "Relation: " << count << " - Type '" << Relation->Type() << "', Target '" << Relation->Target() << "'" << std::endl; + } +} + +int main(int argc, const char *argv[]) +{ + MusicBrainz4::CQuery MB2("MBTest/v1.0","test.musicbrainz.org"); + + MusicBrainz4::CQuery::tParamMap Params5; + Params5["inc"]="aliases"; + MusicBrainz4::CMetadata Metadata5=MB2.Query("artist","4b585938-f271-45e2-b19a-91c634b5e396","",Params5); + MusicBrainz4::CArtist *Artist=Metadata5.Artist(); + if (Artist) + { + MusicBrainz4::CLifespan *Lifespan=Artist->Lifespan(); + if (Lifespan) + { + std::cout << "Begin: " << Lifespan->Begin() << std::endl; + std::cout << "End: " << Lifespan->End() << std::endl; + std::cout << "Ended: " << Lifespan->Ended() << std::endl; + } + } + + return 0; + + MusicBrainz4::CMetadata Metadata8=MB2.Query("release-group","2eefe885-f050-426d-93f0-29c5eb8b4f9a"); + std::cout << Metadata8 << std::endl; + return 0; + + MusicBrainz4::CMetadata Metadata7=MB2.Query("artist","4b585938-f271-45e2-b19a-91c634b5e396"); + Artist=Metadata7.Artist(); + if (Artist) + { + std::cout << "IPI: " << Artist->IPI() << std::endl; + + MusicBrainz4::CIPIList *IPIList=Artist->IPIList(); + if (IPIList) + { + for (int count=0;countNumItems();count++) + { + MusicBrainz4::CIPI *IPI=IPIList->Item(count); + if (IPI) + { + std::cout << "IPI " << count << ": " << IPI->IPI() << std::endl; + } + } + } + } + + return 0; + + MusicBrainz4::CMetadata Metadata6=MB2.Query("release-group","2eefe885-f050-426d-93f0-29c5eb8b4f9a"); + MusicBrainz4::CReleaseGroup *ReleaseGroup=Metadata6.ReleaseGroup(); + if (ReleaseGroup) + { + std::cout << "ID: " << ReleaseGroup->ID() << std::endl; + std::cout << "Type: " << ReleaseGroup->Type() << std::endl; + std::cout << "Title: " << ReleaseGroup->Title() << std::endl; + std::cout << "Disambiguation: " << ReleaseGroup->Disambiguation() << std::endl; + std::cout << "FirstReleaseDate: " << ReleaseGroup->FirstReleaseDate() << std::endl; + + MusicBrainz4::CSecondaryTypeList *SecondaryTypeList=ReleaseGroup->SecondaryTypeList(); + if (SecondaryTypeList) + { + for (int count=0;countNumItems();count++) + { + MusicBrainz4::CSecondaryType *SecondaryType=SecondaryTypeList->Item(count); + if (SecondaryType) + { + std::cout << "Secondary type " << count << " = " << SecondaryType->SecondaryType() << std::endl; + } + } + } + } + + return 0; + + MusicBrainz4::CMetadata Metadata4=MB2.Query("work","b0d17375-5593-390e-a936-1a65ce74c630"); + + MusicBrainz4::CWork *ThisWork=Metadata4.Work(); + if (ThisWork) + { + std::cout << "ID: '" << ThisWork->ID() << "'" << std::endl; + std::cout << "Title: '" << ThisWork->Title() << "'" << std::endl; + std::cout << "ISWC: '" << ThisWork->ISWC() << "'" << std::endl; + + MusicBrainz4::CISWCList *ISWCList=ThisWork->ISWCList(); + if (ISWCList) + { + for (int count=0;countNumItems();count++) + { + MusicBrainz4::CISWC *ISWC=ISWCList->Item(count); + std::cout << "ISWC " << count << " - '" << ISWC->ISWC() << "'" << std::endl; + } + } + + std::cout << "Disambiguation: '" << ThisWork->Disambiguation() << "'" << std::endl; + std::cout << "Language: '" << ThisWork->Language() << "'" << std::endl; + } + + MusicBrainz4::CQuery::tParamMap Params3; + Params3["inc"]="media recordings"; + + Metadata4=MB2.Query("release","ae050d13-7f86-495e-9918-10d8c0ac58e8","",Params3); + MusicBrainz4::CRelease *Release2=Metadata4.Release(); + if (Release2) + { + MusicBrainz4::CMediumList *MediumList=Release2->MediumList(); + if (MediumList) + { + for (int count=0;countNumItems();count++) + { + MusicBrainz4::CMedium *Medium=MediumList->Item(count); + if (Medium) + { + MusicBrainz4::CTrackList *TrackList=Medium->TrackList(); + if (TrackList) + { + for (int track=0;trackNumItems();track++) + { + MusicBrainz4::CTrack *Track=TrackList->Item(track); + if (Track) + { + std::cout << "Position: " << Track->Position() << std::endl; + std::cout << "Title: " << Track->Title() << std::endl; + std::cout << "Length: " << Track->Length() << std::endl; + std::cout << "Number: " << Track->Number() << std::endl; + } + } + } + } + } + } + } + + return 0; + + MusicBrainz4::CQuery MB("MBTest/v1.0"); + + if (argc>1) + { + std::cout << "Setting username: '" << argv[1] << "'" << std::endl; + MB.SetUserName(argv[1]); + } + + if (argc>2) + { + std::cout << "Setting password: '" << argv[2] << "'" << std::endl; + MB.SetPassword(argv[2]); + } + + MusicBrainz4::CQuery::tParamMap Params2; + Params2["inc"]="artists release-groups url-rels work-level-rels work-rels artist-rels"; + MusicBrainz4::CMetadata Metadata3=MB.Query("recording","3631f569-520d-40ff-a1ee-076604723275","",Params2); + MusicBrainz4::CRecording *Recording=Metadata3.Recording(); + if (Recording) + { + MusicBrainz4::CRelationList *RelationList=Recording->RelationList(); + PrintRelationList(RelationList); + + MusicBrainz4::CRelationListList *RelationListList=Recording->RelationListList(); + for (int count=0;countNumItems();count++) + { + MusicBrainz4::CRelationList *RelationList=RelationListList->Item(count); + PrintRelationList(RelationList); + } + } + + return 0; + + MusicBrainz4::CQuery::tParamMap Params; + Params["inc"]="artists labels recordings release-groups url-rels discids recording-level-rels work-level-rels work-rels artist-rels"; + + MusicBrainz4::CMetadata Metadata2=MB.Query("release","ef4596f0-5554-443a-aea9-247d2e250f61","",Params); + + MusicBrainz4::CRelease *Release=Metadata2.Release(); + if (Release) + { + MusicBrainz4::CMediumList *MediumList=Release->MediumList(); + + if (MediumList) + { + for (int MediumNum=0;MediumNumNumItems();MediumNum++) + { + MusicBrainz4::CMedium *Medium=MediumList->Item(MediumNum); + if (Medium) + { + MusicBrainz4::CTrackList *TrackList=Medium->TrackList(); + if (TrackList) + { + for (int TrackNum=0;TrackNumNumItems();TrackNum++) + { + MusicBrainz4::CTrack *Track=TrackList->Item(TrackNum); + if (Track) + { + MusicBrainz4::CRecording *Recording=Track->Recording(); + if (Recording) + { + MusicBrainz4::CRelationListList *RelationListList=Recording->RelationListList(); + if (RelationListList) + { + std::cout << RelationListList->NumItems() << " items" << std::endl; + for (int RelationListNum=0;RelationListNumNumItems();RelationListNum++) + { + MusicBrainz4::CRelationList *RelationList=RelationListList->Item(RelationListNum); + PrintRelationList(RelationList); + } + } + } + } + } + } + } + } + } + } + + return 0; + + MusicBrainz4::CMetadata Metadata=MB.Query("collection"); + MusicBrainz4::CCollectionList *CollectionList=Metadata.CollectionList(); + if (CollectionList && 0!=CollectionList->NumItems()) + { + MusicBrainz4::CCollection *Collection=CollectionList->Item(0); + std::cout << "ID is " << Collection->ID() << std::endl; + + MB.Query("collection",Collection->ID(),"releases"); + + std::vector Releases; + Releases.push_back("b5748ac9-f38e-48f7-a8a4-8b43cab025bc"); + Releases.push_back("f6335672-c521-4129-86c3-490d20533e08"); + bool Ret=MB.AddCollectionEntries(Collection->ID(),Releases); + std::cout << "AddCollectionEntries returns " << std::boolalpha << Ret << std::endl; + + MB.Query("collection",Collection->ID(),"releases"); + + Releases.clear(); + Releases.push_back("b5748ac9-f38e-48f7-a8a4-8b43cab025bc"); + Ret=MB.DeleteCollectionEntries(Collection->ID(),Releases); + std::cout << "DeleteCollectionEntries returns " << std::boolalpha << Ret << std::endl; + + MB.Query("collection",Collection->ID(),"releases"); + } + + return 0; + + std::string DiscID="arIS30RPWowvwNEqsqdDnZzDGhk-"; + + if (argc==2) + DiscID=argv[1]; + + MusicBrainz4::CReleaseList ReleaseList=MB.LookupDiscID(DiscID); + + for (int count=0;countID()); + + std::cout << "Full release: " << std::endl; + + std::cout << FullRelease << std::endl; + + std::cout << "Release group title: '" << FullRelease.ReleaseGroup()->Title() << "'" << std::endl; + + std::cout << std::endl << std::endl << "Media matching " << DiscID << ":" << std::endl; + + MusicBrainz4::CMediumList MediaList=FullRelease.MediaMatchingDiscID(DiscID); + + for (int count=0;count