[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: kdesupport/taglib
From: Lukáš Lalinský <lalinsky () gmail ! com>
Date: 2009-09-04 9:30:02
Message-ID: 1252056602.440129.16547.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1019671 by lalinsky:
Add support for a global, installable config header
M +9 -0 CMakeLists.txt
M +2 -2 bindings/c/tag_c.cpp
M +5 -4 configure.in.in
M +1 -1 taglib/Makefile.am
M +1 -1 taglib/asf/asfattribute.cpp
M +1 -1 taglib/asf/asffile.cpp
M +1 -1 taglib/asf/asfproperties.cpp
M +1 -1 taglib/asf/asftag.cpp
M +4 -4 taglib/fileref.cpp
M +1 -1 taglib/mp4/mp4atom.cpp
M +1 -1 taglib/mp4/mp4file.cpp
M +1 -1 taglib/mp4/mp4item.cpp
M +1 -1 taglib/mp4/mp4properties.cpp
M +1 -1 taglib/mp4/mp4tag.cpp
A taglib/taglib_config.h.cmake
A taglib/taglib_config.h.in
M +2 -0 taglib/taglib_export.h
M +4 -4 tests/test_fileref.cpp
--- trunk/kdesupport/taglib/CMakeLists.txt #1019670:1019671
@@ -53,6 +53,15 @@
include_directories(${CMAKE_CURRENT_BINARY_DIR})
configure_file(config-taglib.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h )
+if(WITH_ASF)
+ set(TAGLIB_WITH_ASF TRUE)
+endif(WITH_ASF)
+if(WITH_MP4)
+ set(TAGLIB_WITH_MP4 TRUE)
+endif(WITH_MP4)
+configure_file(taglib/taglib_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib_config.h )
+install( FILES ${CMAKE_CURRENT_BINARY_DIR}/taglib_config.h DESTINATION ${INCLUDE_INSTALL_DIR}/taglib)
+
ADD_SUBDIRECTORY( taglib )
ADD_SUBDIRECTORY(tests)
--- trunk/kdesupport/taglib/bindings/c/tag_c.cpp #1019670:1019671
@@ -86,11 +86,11 @@
return reinterpret_cast<TagLib_File *>(new Ogg::Speex::File(filename));
case TagLib_File_TrueAudio:
return reinterpret_cast<TagLib_File *>(new TrueAudio::File(filename));
-#ifdef WITH_MP4
+#ifdef TAGLIB_WITH_MP4
case TagLib_File_MP4:
return reinterpret_cast<TagLib_File *>(new MP4::File(filename));
#endif
-#ifdef WITH_ASF
+#ifdef TAGLIB_WITH_ASF
case TagLib_File_ASF:
return reinterpret_cast<TagLib_File *>(new ASF::File(filename));
#endif
--- trunk/kdesupport/taglib/configure.in.in #1019670:1019671
@@ -56,6 +56,7 @@
dnl without this order in this file, automake will be confused!
dnl
AM_CONFIG_HEADER(config.h)
+AM_CONFIG_HEADER(taglib/taglib_config.h)
dnl checks for programs.
dnl first check for c/c++ compilers
@@ -129,15 +130,15 @@
AC_ARG_ENABLE([mp4],
[AS_HELP_STRING([--enable-mp4], [add MP4 support])],
[
- AC_DEFINE([WITH_MP4], [1],
- [With MP4 support])
+ AC_DEFINE([WITH_MP4], [1], [With MP4 support]),
+ AC_DEFINE([TAGLIB_WITH_MP4], [1], [With MP4 support])
])
AC_ARG_ENABLE([asf],
[AS_HELP_STRING([--enable-asf], [add ASF support])],
[
- AC_DEFINE([WITH_ASF], [1],
- [With ASF support])
+ AC_DEFINE([WITH_ASF], [1], [With ASF support]),
+ AC_DEFINE([TAGLIB_WITH_ASF], [1], [With ASF support])
])
AC_LANG_SAVE
--- trunk/kdesupport/taglib/taglib/Makefile.am #1019670:1019671
@@ -24,7 +24,7 @@
lib_LTLIBRARIES = libtag.la
libtag_la_SOURCES = tag.cpp tagunion.cpp fileref.cpp audioproperties.cpp
-taglib_include_HEADERS = tag.h fileref.h audioproperties.h taglib_export.h
+taglib_include_HEADERS = tag.h fileref.h audioproperties.h taglib_export.h taglib_config.h
taglib_includedir = $(includedir)/taglib
# Here are a set of rules to help you update your library version information:
--- trunk/kdesupport/taglib/taglib/asf/asfattribute.cpp #1019670:1019671
@@ -27,7 +27,7 @@
#include <config.h>
#endif
-#ifdef WITH_ASF
+#ifdef TAGLIB_WITH_ASF
#include <taglib.h>
#include "asfattribute.h"
--- trunk/kdesupport/taglib/taglib/asf/asffile.cpp #1019670:1019671
@@ -27,7 +27,7 @@
#include <config.h>
#endif
-#ifdef WITH_ASF
+#ifdef TAGLIB_WITH_ASF
#include <tdebug.h>
#include <tbytevectorlist.h>
--- trunk/kdesupport/taglib/taglib/asf/asfproperties.cpp #1019670:1019671
@@ -27,7 +27,7 @@
#include <config.h>
#endif
-#ifdef WITH_ASF
+#ifdef TAGLIB_WITH_ASF
#include <tdebug.h>
#include <tstring.h>
--- trunk/kdesupport/taglib/taglib/asf/asftag.cpp #1019670:1019671
@@ -27,7 +27,7 @@
#include <config.h>
#endif
-#ifdef WITH_ASF
+#ifdef TAGLIB_WITH_ASF
#include "asftag.h"
--- trunk/kdesupport/taglib/taglib/fileref.cpp #1019670:1019671
@@ -129,14 +129,14 @@
l.append("wv");
l.append("spx");
l.append("tta");
-#ifdef WITH_MP4
+#ifdef TAGLIB_WITH_MP4
l.append("m4a");
l.append("m4b");
l.append("m4p");
l.append("3g2");
l.append("mp4");
#endif
-#ifdef WITH_ASF
+#ifdef TAGLIB_WITH_ASF
l.append("wma");
l.append("asf");
#endif
@@ -221,11 +221,11 @@
return new Ogg::Speex::File(fileName, readAudioProperties, audioPropertiesStyle);
if(ext == "TTA")
return new TrueAudio::File(fileName, readAudioProperties, audioPropertiesStyle);
-#ifdef WITH_MP4
+#ifdef TAGLIB_WITH_MP4
if(ext == "M4A" || ext == "M4B" || ext == "M4P" || ext == "MP4" || ext == "3G2")
return new MP4::File(fileName, readAudioProperties, audioPropertiesStyle);
#endif
-#ifdef WITH_ASF
+#ifdef TAGLIB_WITH_ASF
if(ext == "WMA" || ext == "ASF")
return new ASF::File(fileName, readAudioProperties, audioPropertiesStyle);
#endif
--- trunk/kdesupport/taglib/taglib/mp4/mp4atom.cpp #1019670:1019671
@@ -27,7 +27,7 @@
#include <config.h>
#endif
-#ifdef WITH_MP4
+#ifdef TAGLIB_WITH_MP4
#include <tdebug.h>
#include <tstring.h>
--- trunk/kdesupport/taglib/taglib/mp4/mp4file.cpp #1019670:1019671
@@ -27,7 +27,7 @@
#include <config.h>
#endif
-#ifdef WITH_MP4
+#ifdef TAGLIB_WITH_MP4
#include <tdebug.h>
#include <tstring.h>
--- trunk/kdesupport/taglib/taglib/mp4/mp4item.cpp #1019670:1019671
@@ -27,7 +27,7 @@
#include <config.h>
#endif
-#ifdef WITH_MP4
+#ifdef TAGLIB_WITH_MP4
#include <taglib.h>
#include <tdebug.h>
--- trunk/kdesupport/taglib/taglib/mp4/mp4properties.cpp #1019670:1019671
@@ -27,7 +27,7 @@
#include <config.h>
#endif
-#ifdef WITH_MP4
+#ifdef TAGLIB_WITH_MP4
#include <tdebug.h>
#include <tstring.h>
--- trunk/kdesupport/taglib/taglib/mp4/mp4tag.cpp #1019670:1019671
@@ -27,7 +27,7 @@
#include <config.h>
#endif
-#ifdef WITH_MP4
+#ifdef TAGLIB_WITH_MP4
#include <tdebug.h>
#include <tstring.h>
--- trunk/kdesupport/taglib/taglib/taglib_export.h #1019670:1019671
@@ -36,4 +36,6 @@
#define TAGLIB_EXPORT
#endif
+#include "taglib_config.h"
+
#endif
--- trunk/kdesupport/taglib/tests/test_fileref.cpp #1019670:1019671
@@ -14,7 +14,7 @@
class TestFileRef : public CppUnit::TestFixture
{
CPPUNIT_TEST_SUITE(TestFileRef);
-#ifdef WITH_ASF
+#ifdef TAGLIB_WITH_ASF
CPPUNIT_TEST(testASF);
#endif
CPPUNIT_TEST(testMusepack);
@@ -22,7 +22,7 @@
CPPUNIT_TEST(testSpeex);
CPPUNIT_TEST(testFLAC);
CPPUNIT_TEST(testMP3);
-#ifdef WITH_MP4
+#ifdef TAGLIB_WITH_MP4
CPPUNIT_TEST(testMP4_1);
CPPUNIT_TEST(testMP4_2);
CPPUNIT_TEST(testMP4_3);
@@ -82,7 +82,7 @@
fileRefSave("click", ".mpc");
}
-#ifdef WITH_ASF
+#ifdef TAGLIB_WITH_ASF
void testASF()
{
fileRefSave("silence-1", ".wma");
@@ -114,7 +114,7 @@
fileRefSave("empty", ".tta");
}
-#ifdef WITH_MP4
+#ifdef TAGLIB_WITH_MP4
void testMP4_1()
{
fileRefSave("has-tags", ".m4a");
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic