mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-06-04 01:28:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove the options to disable MP4/ASF support

Browse Source
This commit is contained in:
Lukáš Lalinský 2011-06-24 08:49:50 +02:00
parent 0b34d4f8ee
commit dd846904cb
18 changed files with 18 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -14,8 +14,6 @@ option(BUILD_TESTS "Build the test suite" OFF)
option(BUILD_EXAMPLES "Build the examples" OFF)
option(NO_ITUNES_HACKS "Disable workarounds for iTunes bugs" OFF)
option(WITH_ASF "Enable ASF tag reading/writing code" ON)
option(WITH_MP4 "Enable MP4 tag reading/writing code" ON)
add_definitions(-DHAVE_CONFIG_H)
set(TESTS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/tests/")

4
bindings/c/tag_c.cpp
View File

@ -86,14 +86,10 @@ TagLib_File *taglib_file_new_type(const char *filename, TagLib_File_Type type)
return reinterpret_cast<TagLib_File *>(new Ogg::Speex::File(filename));
case TagLib_File_TrueAudio:
return reinterpret_cast<TagLib_File *>(new TrueAudio::File(filename));
#ifdef TAGLIB_WITH_MP4
case TagLib_File_MP4:
return reinterpret_cast<TagLib_File *>(new MP4::File(filename));
#endif
#ifdef TAGLIB_WITH_ASF
case TagLib_File_ASF:
return reinterpret_cast<TagLib_File *>(new ASF::File(filename));
#endif
default:
return 0;
}

37
taglib/CMakeLists.txt
View File

@ -97,26 +97,18 @@ set(tag_HDRS
riff/aiff/aiffproperties.h
riff/wav/wavfile.h
riff/wav/wavproperties.h
asf/asffile.h
asf/asfproperties.h
asf/asftag.h
asf/asfattribute.h
asf/asfpicture.h
mp4/mp4file.h
mp4/mp4atom.h
mp4/mp4tag.h
mp4/mp4item.h
mp4/mp4properties.h
mp4/mp4coverart.h
)
if(WITH_ASF)
set(tag_HDRS ${tag_HDRS}
asf/asffile.h
asf/asfproperties.h
asf/asftag.h
asf/asfattribute.h
asf/asfpicture.h
)
endif()
if(WITH_MP4)
set(tag_HDRS ${tag_HDRS}
mp4/mp4file.h
mp4/mp4atom.h
mp4/mp4tag.h
mp4/mp4item.h
mp4/mp4properties.h
mp4/mp4coverart.h
)
endif()
set(mpeg_SRCS
mpeg/mpegfile.cpp
@ -254,17 +246,12 @@ set(tag_LIB_SRCS
${mpeg_SRCS} ${id3v1_SRCS} ${id3v2_SRCS} ${frames_SRCS} ${ogg_SRCS}
${vorbis_SRCS} ${oggflacs_SRCS} ${mpc_SRCS} ${ape_SRCS} ${toolkit_SRCS} ${flacs_SRCS}
${wavpack_SRCS} ${speex_SRCS} ${trueaudio_SRCS} ${riff_SRCS} ${aiff_SRCS} ${wav_SRCS}
${asf_SRCS} ${mp4_SRCS}
tag.cpp
tagunion.cpp
fileref.cpp
audioproperties.cpp
)
if(WITH_ASF)
set(tag_LIB_SRCS ${tag_LIB_SRCS} ${asf_SRCS})
endif()
if(WITH_MP4)
set(tag_LIB_SRCS ${tag_LIB_SRCS} ${mp4_SRCS})
endif()
add_library(tag ${tag_LIB_SRCS} ${tag_HDRS})

3
taglib/asf/asfattribute.cpp
View File

@ -27,8 +27,6 @@
#include <config.h>
#endif
#ifdef WITH_ASF
#include <taglib.h>
#include <tdebug.h>
#include "asfattribute.h"
@ -353,4 +351,3 @@ void ASF::Attribute::setStream(int value)
d->stream = value;
}
#endif

3
taglib/asf/asffile.cpp
View File

@ -27,8 +27,6 @@
#include <config.h>
#endif
#ifdef WITH_ASF
#include <tdebug.h>
#include <tbytevectorlist.h>
#include <tstring.h>
@ -607,4 +605,3 @@ ByteVector ASF::File::renderString(const String &str, bool includeLength)
return data;
}
#endif

3
taglib/asf/asfpicture.cpp
View File

@ -27,8 +27,6 @@
#include <config.h>
#endif
#ifdef WITH_ASF
#include <taglib.h>
#include <tdebug.h>
#include "asfattribute.h"
@ -182,4 +180,3 @@ ASF::Picture ASF::Picture::fromInvalid()
return ret;
}
#endif

3
taglib/asf/asfproperties.cpp
View File

@ -27,8 +27,6 @@
#include <config.h>
#endif
#ifdef WITH_ASF
#include <tdebug.h>
#include <tstring.h>
#include "asfproperties.h"
@ -115,4 +113,3 @@ void ASF::Properties::setEncrypted(bool encrypted)
d->encrypted = encrypted;
}
#endif

3
taglib/asf/asftag.cpp
View File

@ -27,8 +27,6 @@
#include <config.h>
#endif
#ifdef WITH_ASF
#include "asftag.h"
using namespace TagLib;
@ -198,4 +196,3 @@ bool ASF::Tag::isEmpty() const
d->attributeListMap.isEmpty();
}
#endif

8
taglib/fileref.cpp
View File

@ -147,17 +147,13 @@ StringList FileRef::defaultFileExtensions()
l.append("wv");
l.append("spx");
l.append("tta");
#ifdef TAGLIB_WITH_MP4
l.append("m4a");
l.append("m4b");
l.append("m4p");
l.append("3g2");
l.append("mp4");
#endif
#ifdef TAGLIB_WITH_ASF
l.append("wma");
l.append("asf");
#endif
l.append("aif");
l.append("aiff");
l.append("wav");
@ -246,14 +242,10 @@ File *FileRef::create(FileName fileName, bool readAudioProperties,
return new Ogg::Speex::File(fileName, readAudioProperties, audioPropertiesStyle);
if(ext == "TTA")
return new TrueAudio::File(fileName, readAudioProperties, audioPropertiesStyle);
#ifdef TAGLIB_WITH_MP4
if(ext == "M4A" || ext == "M4B" || ext == "M4P" || ext == "MP4" || ext == "3G2")
return new MP4::File(fileName, readAudioProperties, audioPropertiesStyle);
#endif
#ifdef TAGLIB_WITH_ASF
if(ext == "WMA" || ext == "ASF")
return new ASF::File(fileName, readAudioProperties, audioPropertiesStyle);
#endif
if(ext == "AIF" || ext == "AIFF")
return new RIFF::AIFF::File(fileName, readAudioProperties, audioPropertiesStyle);
if(ext == "WAV")

3
taglib/mp4/mp4atom.cpp
View File

@ -27,8 +27,6 @@
#include <config.h>
#endif
#ifdef WITH_MP4
#include <tdebug.h>
#include <tstring.h>
#include "mp4atom.h"
@ -198,4 +196,3 @@ MP4::Atoms::path(const char *name1, const char *name2, const char *name3, const
return path;
}
#endif

3
taglib/mp4/mp4coverart.cpp
View File

@ -27,8 +27,6 @@
#include <config.h>
#endif
#ifdef WITH_MP4
#include <taglib.h>
#include <tdebug.h>
#include "mp4coverart.h"
@ -86,4 +84,3 @@ MP4::CoverArt::data() const
return d->data;
}
#endif

3
taglib/mp4/mp4file.cpp
View File

@ -27,8 +27,6 @@
#include <config.h>
#endif
#ifdef WITH_MP4
#include <tdebug.h>
#include <tstring.h>
#include "mp4atom.h"
@ -149,4 +147,3 @@ MP4::File::save()
return d->tag->save();
}
#endif

3
taglib/mp4/mp4item.cpp
View File

@ -27,8 +27,6 @@
#include <config.h>
#endif
#ifdef WITH_MP4
#include <taglib.h>
#include <tdebug.h>
#include "mp4item.h"
@ -146,4 +144,3 @@ MP4::Item::isValid() const
return d->valid;
}
#endif

3
taglib/mp4/mp4properties.cpp
View File

@ -27,8 +27,6 @@
#include <config.h>
#endif
#ifdef WITH_MP4
#include <tdebug.h>
#include <tstring.h>
#include "mp4file.h"
@ -186,4 +184,3 @@ MP4::Properties::isEncrypted() const
return d->encrypted;
}
#endif

3
taglib/mp4/mp4tag.cpp
View File

@ -27,8 +27,6 @@
#include <config.h>
#endif
#ifdef WITH_MP4
#include <tdebug.h>
#include <tstring.h>
#include "mp4atom.h"
@ -638,4 +636,3 @@ MP4::Tag::itemListMap()
return d->items;
}
#endif

4
taglib/taglib_config.h.cmake
View File

@ -1,4 +1,4 @@
/* taglib_config.h. Generated by cmake from taglib_config.h.cmake */
#cmakedefine TAGLIB_WITH_ASF 1
#cmakedefine TAGLIB_WITH_MP4 1
#define TAGLIB_WITH_ASF 1
#define TAGLIB_WITH_MP4 1

15
tests/CMakeLists.txt
View File

@ -47,18 +47,11 @@ SET(test_runner_SRCS
test_apetag.cpp
test_wav.cpp
test_wavpack.cpp
test_mp4.cpp
test_mp4item.cpp
test_mp4coverart.cpp
test_asf.cpp
)
IF(WITH_MP4)
SET(test_runner_SRCS ${test_runner_SRCS}
test_mp4.cpp
test_mp4item.cpp
test_mp4coverart.cpp
)
ENDIF(WITH_MP4)
IF(WITH_ASF)
SET(test_runner_SRCS ${test_runner_SRCS} test_asf.cpp)
ENDIF(WITH_ASF)
ADD_EXECUTABLE(test_runner ${test_runner_SRCS})
TARGET_LINK_LIBRARIES(test_runner tag ${CPPUNIT_LIBRARIES})

8
tests/test_fileref.cpp
View File

@ -16,9 +16,7 @@ using namespace TagLib;
class TestFileRef : public CppUnit::TestFixture
{
CPPUNIT_TEST_SUITE(TestFileRef);
#ifdef TAGLIB_WITH_ASF
CPPUNIT_TEST(testASF);
#endif
CPPUNIT_TEST(testMusepack);
CPPUNIT_TEST(testVorbis);
CPPUNIT_TEST(testSpeex);
@ -26,11 +24,9 @@ class TestFileRef : public CppUnit::TestFixture
CPPUNIT_TEST(testMP3);
CPPUNIT_TEST(testOGA_FLAC);
CPPUNIT_TEST(testOGA_Vorbis);
#ifdef TAGLIB_WITH_MP4
CPPUNIT_TEST(testMP4_1);
CPPUNIT_TEST(testMP4_2);
CPPUNIT_TEST(testMP4_3);
#endif
CPPUNIT_TEST(testTrueAudio);
CPPUNIT_TEST(testAPE);
CPPUNIT_TEST_SUITE_END();
@ -86,12 +82,10 @@ public:
fileRefSave("click", ".mpc");
}
#ifdef TAGLIB_WITH_ASF
void testASF()
{
fileRefSave("silence-1", ".wma");
}
#endif
void testVorbis()
{
@ -118,7 +112,6 @@ public:
fileRefSave("empty", ".tta");
}
#ifdef TAGLIB_WITH_MP4
void testMP4_1()
{
fileRefSave("has-tags", ".m4a");
@ -133,7 +126,6 @@ public:
{
fileRefSave("no-tags", ".3g2");
}
#endif
void testOGA_FLAC()
{