Merge branch 'master' into taglib2

Browse Source

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

...

This commit is contained in:

Tsuda Kageyu

2015-08-10 00:24:20 +09:00

parent ab2389819e a23f808627

commit e6e11c957d

178 changed files with 4703 additions and 2281 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

tests/data/alaw.wav

Binary file not shown.

BIN

tests/data/ape-id3v1.mp3 Normal file

Binary file not shown.

BIN

tests/data/ape-id3v2.mp3 Normal file

Binary file not shown.

BIN

tests/data/ape.mp3 Normal file

Binary file not shown.

BIN

tests/data/bladeenc.mp3 Normal file

Binary file not shown.

BIN

tests/data/duplicate_id3v2.aiff Normal file

Binary file not shown.

BIN

tests/data/duplicate_tags.wav Normal file

Binary file not shown.

BIN

tests/data/float64.wav Normal file

Binary file not shown.

BIN

tests/data/four_channels.wv Normal file

Binary file not shown.

BIN

tests/data/infloop.m4a Normal file

Binary file not shown.

BIN

tests/data/infloop.wv Normal file

Binary file not shown.

BIN

tests/data/lame_cbr.mp3 Normal file

Binary file not shown.

BIN

tests/data/lame_vbr.mp3 Normal file

Binary file not shown.

BIN

tests/data/lossless.wma Normal file

Binary file not shown.

BIN

tests/data/mac-399-id3v2.ape Normal file

Binary file not shown.

BIN

tests/data/mac-399-tagged.ape Normal file

Binary file not shown.

BIN

tests/data/mac-399.ape

Binary file not shown.

BIN

tests/data/sinewave.flac Normal file

Binary file not shown.

BIN

tests/data/tagged.tta Normal file

Binary file not shown.

BIN

tests/data/tagged.wv Normal file

Binary file not shown.

BIN

tests/data/vbri.mp3 Normal file

Binary file not shown.

BIN

tests/data/zero-sized-padding.flac Normal file

Binary file not shown.