Merge branch 'master' into taglib2

Conflicts:
	CMakeLists.txt
	ConfigureChecks.cmake
	config.h.cmake
	taglib/CMakeLists.txt
	taglib/ape/apefile.cpp
	taglib/ape/apefile.h
	taglib/ape/apeproperties.cpp
	taglib/ape/apeproperties.h
	taglib/ape/apetag.cpp
	taglib/asf/asfattribute.cpp
	taglib/asf/asffile.cpp
	taglib/asf/asffile.h
	taglib/asf/asfpicture.cpp
	taglib/asf/asfpicture.h
	taglib/asf/asfproperties.cpp
	taglib/asf/asfproperties.h
	taglib/audioproperties.cpp
	taglib/flac/flacfile.cpp
	taglib/flac/flacfile.h
	taglib/flac/flacproperties.cpp
	taglib/flac/flacproperties.h
	taglib/it/itproperties.cpp
	taglib/mod/modproperties.cpp
	taglib/mp4/mp4atom.cpp
	taglib/mp4/mp4file.cpp
	taglib/mp4/mp4file.h
	taglib/mp4/mp4properties.cpp
	taglib/mp4/mp4tag.cpp
	taglib/mp4/mp4tag.h
	taglib/mpc/mpcfile.cpp
	taglib/mpc/mpcfile.h
	taglib/mpc/mpcproperties.cpp
	taglib/mpc/mpcproperties.h
	taglib/mpeg/id3v2/frames/chapterframe.cpp
	taglib/mpeg/id3v2/frames/synchronizedlyricsframe.cpp
	taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp
	taglib/mpeg/mpegfile.cpp
	taglib/mpeg/mpegfile.h
	taglib/mpeg/mpegheader.cpp
	taglib/mpeg/mpegproperties.cpp
	taglib/mpeg/mpegproperties.h
	taglib/mpeg/xingheader.cpp
	taglib/mpeg/xingheader.h
	taglib/ogg/opus/opusfile.cpp
	taglib/ogg/opus/opusfile.h
	taglib/ogg/opus/opusproperties.cpp
	taglib/ogg/opus/opusproperties.h
	taglib/ogg/speex/speexfile.cpp
	taglib/ogg/speex/speexfile.h
	taglib/ogg/speex/speexproperties.cpp
	taglib/ogg/speex/speexproperties.h
	taglib/ogg/vorbis/vorbisfile.cpp
	taglib/ogg/vorbis/vorbisfile.h
	taglib/ogg/vorbis/vorbisproperties.cpp
	taglib/ogg/vorbis/vorbisproperties.h
	taglib/riff/aiff/aifffile.cpp
	taglib/riff/aiff/aifffile.h
	taglib/riff/aiff/aiffproperties.cpp
	taglib/riff/aiff/aiffproperties.h
	taglib/riff/wav/infotag.h
	taglib/riff/wav/wavfile.cpp
	taglib/riff/wav/wavfile.h
	taglib/riff/wav/wavproperties.cpp
	taglib/riff/wav/wavproperties.h
	taglib/s3m/s3mproperties.cpp
	taglib/taglib_config.h.cmake
	taglib/toolkit/tbytevector.cpp
	taglib/toolkit/tfile.cpp
	taglib/toolkit/tfile.h
	taglib/toolkit/tfilestream.cpp
	taglib/toolkit/trefcounter.cpp
	taglib/toolkit/tstring.cpp
	taglib/toolkit/tstring.h
	taglib/toolkit/tutils.h
	taglib/trueaudio/trueaudiofile.cpp
	taglib/trueaudio/trueaudiofile.h
	taglib/trueaudio/trueaudioproperties.cpp
	taglib/trueaudio/trueaudioproperties.h
	taglib/wavpack/wavpackfile.cpp
	taglib/wavpack/wavpackfile.h
	taglib/wavpack/wavpackproperties.cpp
	taglib/wavpack/wavpackproperties.h
	taglib/xm/xmproperties.cpp
	taglib/xm/xmproperties.h
	tests/CMakeLists.txt
	tests/data/alaw.wav
	tests/test_asf.cpp
	tests/test_mp4.cpp
	tests/test_ogg.cpp
	tests/test_opus.cpp
	tests/test_string.cpp
	tests/test_wav.cpp
	tests/test_wavpack.cpp

cmake/TestFloatFormat.c

@@ -1,17 +0,0 @@
-int main(int argc, char **argv)
-{
-  int ret = 0;
-
-  double bin1[] = {
-    // "*TAGLIB*" encoded as a little-endian floating-point number
-    (double)3.9865557444897601e-105, (double)0.0
-  };
-  float bin2[] = {
-    // "*TL*" encoded as a little-endian floating-point number
-    (float)1.81480400e-013, (float)0.0
-  };
-  ret += ((int*)bin1)[argc];
-  ret += ((int*)bin2)[argc];
-
-  return ret;
-}

cmake/modules/TestFloatFormat.cmake

@@ -1,61 +0,0 @@
-# Returns 1 if IEEE754 little-endian, 2 if IEEE754 big-endian, otherwise 0.
-
-MACRO(TEST_FLOAT_FORMAT FP_IEEE754)
-  IF(NOT FP_IEEE754)
-    TRY_COMPILE(HAVE_FLOAT_FORMAT_BIN
-      "${CMAKE_BINARY_DIR}" "${CMAKE_SOURCE_DIR}/cmake/TestFloatFormat.c"
-    COPY_FILE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/TestFloatFormat.bin")
-
-    SET(FP_IEEE754 0)
-
-    IF(HAVE_FLOAT_FORMAT_BIN)
-
-      # dont match first/last letter because of string rounding errors :-)
-      FILE(STRINGS "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/TestFloatFormat.bin"
-        DOUBLE_IEEE754_LE LIMIT_COUNT 1 REGEX "TAGLIB")
-      FILE(STRINGS "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/TestFloatFormat.bin"
-        DOUBLE_IEEE754_BE LIMIT_COUNT 1 REGEX "BILGAT")
-      FILE(STRINGS "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/TestFloatFormat.bin"
-        FLOAT_IEEE754_LE LIMIT_COUNT 1 REGEX "TL")
-      FILE(STRINGS "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/TestFloatFormat.bin"
-        FLOAT_IEEE754_BE LIMIT_COUNT 1 REGEX "LT")
-
-      IF(DOUBLE_IEEE754_LE AND FLOAT_IEEE754_LE)
-        SET(FP_IEEE754_LE 1)
-      ENDIF()
-
-      IF(DOUBLE_IEEE754_BE AND FLOAT_IEEE754_BE)
-        SET(FP_IEEE754_BE 1)
-      ENDIF()
-
-      # OS X Universal binaries will contain both strings, set it to the host
-      IF(FP_IEEE754_LE AND FP_IEEE754_BE)
-        IF(CMAKE_SYSTEM_PROCESSOR MATCHES powerpc)
-            SET(FP_IEEE754_LE FALSE)
-            SET(FP_IEEE754_BE TRUE)
-        ELSE()
-            SET(FP_IEEE754_LE TRUE)
-            SET(FP_IEEE754_BE FALSE)
-        ENDIF()
-      ENDIF()
-
-      IF(FP_IEEE754_LE)
-        SET(FP_IEEE754 1)
-      ELSEIF(FP_IEEE754_BE)
-        SET(FP_IEEE754 2)
-      ENDIF()
-    ENDIF()
-
-    # just some informational output for the user
-    IF(FP_IEEE754_LE)
-       MESSAGE(STATUS "Checking the floating point format - IEEE754 (LittleEndian)")
-    ELSEIF(FP_IEEE754_BE)
-       MESSAGE(STATUS "Checking the floating point format - IEEE754 (BigEndian)")
-    ELSE()
-       MESSAGE(STATUS "Checking the floating point format - Not IEEE754 or failed to detect.")
-    ENDIF()
-
-    SET(FP_IEEE754 "${${FP_IEEE754}}" CACHE INTERNAL "Result of TEST_FLOAT_FORMAT" FORCE)
-  ENDIF()
-ENDMACRO(TEST_FLOAT_FORMAT FP_IEEE754)
-