ed0305bd3f
Merge branch 'master' into merge-master-to-taglib2
...
# Conflicts:
# taglib/ape/apefile.cpp
# taglib/flac/flacfile.cpp
# taglib/mpc/mpcfile.cpp
# taglib/mpeg/mpegfile.cpp
# taglib/mpeg/mpegfile.h
# taglib/trueaudio/trueaudiofile.cpp
# taglib/wavpack/wavpackfile.cpp
2015-12-21 14:56:13 +09:00
ef92ee223f
Merge pull request #699 from TsudaKageyu/flac-duplicate-comments
...
Remove duplicate Vorbis comment blocks when saving a FLAC file.
2015-12-21 10:03:14 +09:00
aa66b0651d
Merge pull request #688 from TsudaKageyu/save-wv
...
Fix saving WavPack files.
2015-12-18 13:52:54 +09:00
6d27a1013d
Merge pull request #687 from TsudaKageyu/save-mpc
...
Fix saving MPC files.
2015-12-18 09:00:45 +09:00
6998be94f6
Merge pull request #686 from TsudaKageyu/save-ape
...
Fix saving APE files.
2015-12-17 16:57:24 +09:00
862952bdcc
Remove unnecessary private data members from TrueAudio::File.
2015-12-17 11:43:11 +09:00
546870d83a
Merge pull request #684 from TsudaKageyu/save-mpeg
...
Fix saving MPEG files.
2015-12-17 11:24:25 +09:00
f72b0ecebf
Merge branch 'master' into merge-master-to-taglib2
...
# Conflicts:
# CMakeLists.txt
# ConfigureChecks.cmake
# taglib/flac/flacfile.cpp
# taglib/mp4/mp4file.cpp
# taglib/mpeg/mpegheader.cpp
# taglib/mpeg/mpegproperties.cpp
# taglib/riff/rifffile.cpp
# taglib/toolkit/trefcounter.h
2015-12-16 13:33:04 +09:00
fc571e5150
Merge pull request #683 from TsudaKageyu/save-mp4
...
Fix saving MP4 files.
2015-12-16 11:48:52 +09:00
9950fca3c2
Remove duplicate Vorbis comment blocks when saving a FLAC file.
2015-12-16 10:00:08 +09:00
680784c7b7
Merge pull request #682 from TsudaKageyu/save-flac
...
Fix saving FLAC files.
2015-12-15 15:08:14 +09:00
be9b5cc93a
More robust checks for invalid MPEG frame headers.
2015-12-08 11:20:51 +09:00
0e4f9f4e94
Fix a compilation error caused on the merge.
2015-12-03 14:48:21 +09:00
6857926da2
Merge branch 'master' into merge-master-to-taglib2
...
# Conflicts:
# taglib/ape/apefile.cpp
# taglib/ape/apeitem.cpp
# taglib/ape/apeproperties.cpp
# taglib/ape/apetag.cpp
# taglib/ape/apetag.h
# taglib/asf/asffile.cpp
# taglib/asf/asfpicture.cpp
# taglib/flac/flacfile.cpp
# taglib/flac/flacpicture.cpp
# taglib/flac/flacproperties.cpp
# taglib/it/itfile.cpp
# taglib/it/itproperties.cpp
# taglib/mod/modfile.cpp
# taglib/mod/modfilebase.cpp
# taglib/mod/modfilebase.h
# taglib/mod/modfileprivate.h
# taglib/mod/modproperties.cpp
# taglib/mp4/mp4item.cpp
# taglib/mp4/mp4tag.cpp
# taglib/mp4/mp4tag.h
# taglib/mpc/mpcfile.cpp
# taglib/mpc/mpcproperties.cpp
# taglib/mpc/mpcproperties.h
# taglib/mpeg/id3v1/id3v1tag.cpp
# taglib/mpeg/id3v1/id3v1tag.h
# taglib/mpeg/id3v2/frames/attachedpictureframe.cpp
# taglib/mpeg/id3v2/frames/chapterframe.cpp
# taglib/mpeg/id3v2/frames/eventtimingcodesframe.cpp
# taglib/mpeg/id3v2/frames/popularimeterframe.cpp
# taglib/mpeg/id3v2/frames/relativevolumeframe.cpp
# taglib/mpeg/id3v2/frames/synchronizedlyricsframe.cpp
# taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp
# taglib/mpeg/id3v2/frames/textidentificationframe.cpp
# taglib/mpeg/id3v2/id3v2frame.cpp
# taglib/mpeg/id3v2/id3v2framefactory.cpp
# taglib/mpeg/id3v2/id3v2framefactory.h
# taglib/mpeg/id3v2/id3v2tag.cpp
# taglib/mpeg/id3v2/id3v2tag.h
# taglib/mpeg/mpegfile.cpp
# taglib/mpeg/mpegheader.cpp
# taglib/ogg/flac/oggflacfile.cpp
# taglib/ogg/opus/opusproperties.cpp
# taglib/ogg/speex/speexproperties.cpp
# taglib/ogg/vorbis/vorbisproperties.cpp
# taglib/ogg/xiphcomment.cpp
# taglib/ogg/xiphcomment.h
# taglib/riff/aiff/aiffproperties.cpp
# taglib/riff/rifffile.cpp
# taglib/riff/rifffile.h
# taglib/riff/wav/infotag.cpp
# taglib/riff/wav/infotag.h
# taglib/riff/wav/wavproperties.cpp
# taglib/riff/wav/wavproperties.h
# taglib/s3m/s3mproperties.cpp
# taglib/tagunion.cpp
# taglib/tagunion.h
# taglib/toolkit/taglib.h
# taglib/toolkit/tbytevector.cpp
# taglib/toolkit/tbytevector.h
# taglib/toolkit/tbytevectorlist.cpp
# taglib/toolkit/tbytevectorstream.cpp
# taglib/toolkit/tbytevectorstream.h
# taglib/toolkit/tfile.cpp
# taglib/toolkit/tfile.h
# taglib/toolkit/tfilestream.cpp
# taglib/toolkit/tfilestream.h
# taglib/toolkit/tiostream.h
# taglib/toolkit/tlist.h
# taglib/toolkit/tlist.tcc
# taglib/toolkit/tmap.h
# taglib/toolkit/tmap.tcc
# taglib/toolkit/tstring.cpp
# taglib/toolkit/tstring.h
# taglib/trueaudio/trueaudiofile.cpp
# taglib/trueaudio/trueaudioproperties.cpp
# taglib/trueaudio/trueaudioproperties.h
# taglib/wavpack/wavpackfile.cpp
# taglib/wavpack/wavpackproperties.cpp
# taglib/wavpack/wavpackproperties.h
# taglib/xm/xmfile.cpp
# taglib/xm/xmproperties.cpp
# tests/test_apetag.cpp
# tests/test_asf.cpp
# tests/test_bytevector.cpp
# tests/test_bytevectorlist.cpp
# tests/test_file.cpp
# tests/test_flac.cpp
# tests/test_flacpicture.cpp
# tests/test_id3v2.cpp
# tests/test_info.cpp
# tests/test_mp4.cpp
# tests/test_ogg.cpp
# tests/test_riff.cpp
# tests/test_string.cpp
# tests/test_xiphcomment.cpp
2015-12-03 14:44:17 +09:00
24f220224d
Move a test to the proper place.
...
The test is actually for XiphComment, not Vorbis::File.
2015-12-03 13:05:18 +09:00
a0b8683656
Use a standard type rather than TagLib::uint.
...
This won't break the ABI compatibility.
2015-12-03 02:15:41 +09:00
7f8efec4d4
Merge pull request #545 from FestusHagen/fh1.m_TDRC
...
Append TIME to TDRC, adjusted test_id3v2.cpp as appropriate.
2015-12-02 21:11:53 +09:00
dcc0fe553c
Use a standard type rather than TagLib::ushort.
...
This won't break the ABI compatibility.
2015-12-02 18:59:45 +09:00
8bdddaabce
Use a standard type rather than TagLib::uchar.
...
This won't break the ABI compatibility.
2015-12-02 18:11:52 +09:00
e6e9ba6094
Fix saving FLAC files.
...
This fixes all the issues reported at #622 .
2015-12-02 17:21:12 +09:00
1529af7a12
Merge branch 'xiph-picture' of https://github.com/gogglesmm/taglib into gogglesmm-xiph-picture
...
# Conflicts:
# tests/test_bytevector.cpp
# tests/test_ogg.cpp
2015-12-02 14:59:50 +09:00
060a50ab11
Use a standard type rather than TagLib::wchar.
...
This won't break the ABI compatibility.
2015-12-02 11:30:29 +09:00
d36550f96d
Merge branch 'master' into merge-master-to-taglib2
...
# Conflicts:
# taglib/ape/apetag.cpp
# taglib/ape/apetag.h
# taglib/flac/flacproperties.cpp
# taglib/mpeg/id3v1/id3v1tag.cpp
# taglib/mpeg/id3v2/id3v2tag.cpp
# taglib/riff/rifffile.cpp
# taglib/riff/wav/infotag.cpp
# taglib/toolkit/tbytevector.cpp
2015-12-02 09:31:10 +09:00
6f5874a035
Remove the definition of offset_t.
...
The definition of offset_t has changed over time, and it's just equivalent to long long now.
We no longer have a good reason to keep it.
2015-12-01 22:10:24 +09:00
101a330d55
The new test wasn't called.
2015-11-30 18:32:49 +09:00
59088096e6
Add some tests for M4V files.
2015-11-30 17:18:50 +09:00
fcdf7c2ae2
Add some tests to check if the internal flags are updated when writing WAV files.
2015-11-30 13:46:43 +09:00
8c424badad
Avoid writing an empty ID3v2 tag in an AIFF file.
2015-11-30 13:42:25 +09:00
2f29f0e1d0
Merge branch 'master' into merge-master-to-taglib2
...
# Conflicts:
# CMakeLists.txt
# examples/CMakeLists.txt
# tests/test_asf.cpp
# tests/test_fileref.cpp
# tests/test_flac.cpp
# tests/test_mp4.cpp
# tests/test_ogg.cpp
# tests/test_oggflac.cpp
# tests/test_riff.cpp
2015-11-30 11:25:32 +09:00
1fa677e2ef
Add some tests about splitting/merging Ogg pages.
2015-11-29 01:57:15 +09:00
463e8f313a
Append TIME to TDRC, adjusted test_id3v2.cpp as appropriate.
2015-11-27 17:54:20 -05:00
8130b30397
Close temporary files regardless if the tests are successful or not.
...
delete statements are skipped when assertions fail.
2015-11-27 15:20:16 +09:00
905bf89e66
Fix saving WavPack files.
...
This fixes the issue reported at #624 .
2015-11-27 09:30:03 +09:00
67cbf2c0a8
Silence a GCC warning in tests about ignoring a return value.
2015-11-27 02:45:33 +09:00
083eadec60
Fix saving MPC files.
...
This fixes the issue reported at #624 .
2015-11-27 00:53:03 +09:00
f180445be5
Fix saving APE files.
...
This fixes the issue reported at #624 .
2015-11-27 00:22:07 +09:00
b6361ddde5
Fix saving MPEG files.
...
This fixes all the issues reported at #618 .
2015-11-25 01:56:07 +09:00
94b7828990
Fix saving MP4 files.
...
This fixes the issue reported at #619 .
2015-11-24 23:41:10 +09:00
faca7ac8f4
Merge branch 'master' into merge-master-to-talib2
...
# Conflicts:
# taglib/asf/asfattribute.cpp
# taglib/asf/asfpicture.cpp
# taglib/mp4/mp4coverart.cpp
# taglib/mp4/mp4item.cpp
# taglib/mp4/mp4item.h
# taglib/mpeg/id3v2/id3v2framefactory.cpp
# taglib/toolkit/tstring.cpp
# tests/test_string.cpp
2015-11-23 19:04:06 +09:00
477aba9465
Merge pull request #676 from TsudaKageyu/string-hide-private
...
Hide private things from a public header.
2015-11-23 17:48:06 +09:00
e44de9f37f
Remove duplicate tags when saving AIFF files.
...
Just the same way as WAV already does.
2015-11-22 21:03:33 +09:00
973fb49cde
Remove obsolete String::null and related functions.
2015-11-22 17:56:18 +09:00
15775d4135
Merge branch 'master' into taglib2
2015-11-22 16:25:34 +09:00
559c6b28c9
Merge pull request #681 from TsudaKageyu/xiph-remove-fields
...
Add alternative methods to XiphComment::removeField() that may cause …
2015-11-22 16:19:15 +09:00
6566352728
Merge branch 'master' into merge-master-to-taglib2
...
# Conflicts:
# taglib/ape/apefile.cpp
# taglib/ape/apefile.h
# taglib/fileref.cpp
# taglib/flac/flacfile.cpp
# taglib/flac/flacfile.h
# taglib/mpc/mpcfile.cpp
# taglib/mpc/mpcfile.h
# taglib/mpeg/id3v2/frames/synchronizedlyricsframe.cpp
# taglib/mpeg/id3v2/id3v2frame.cpp
# taglib/tagunion.cpp
# taglib/toolkit/tiostream.cpp
# taglib/trueaudio/trueaudiofile.cpp
# taglib/trueaudio/trueaudiofile.h
# taglib/wavpack/wavpackfile.cpp
# taglib/wavpack/wavpackfile.h
# tests/test_fileref.cpp
# tests/test_id3v2.cpp
2015-11-21 20:22:07 +09:00
f34d73d319
Make FileRef::FileTypeResolver work properly.
2015-11-21 18:29:41 +09:00
c3807e59cd
Merge pull request #528 from chouquette/master
...
FileRef: Allow an IOStream to be used
2015-11-21 09:51:03 +09:00
84e3582332
Add alternative methods to XiphComment::removeField().
...
Using XiphComment::removeField() may lead to a linkage error, however we can't fix the method itself without breaking the ABI or changing its behavior.
So we added some alternative method and marked the old one deprecated.
2015-11-20 23:28:32 +09:00
94c941928a
Merge pull request #654 from TsudaKageyu/xiph-setcomment
...
Fix XiphComment::setComment() for the case that a Vorbis comment has …
2015-11-20 23:02:51 +09:00
8c6fe45453
Avoid using String::null where an empty string is required.
...
String::null is not necessarily be empty or remains the same instance.
Using it in a public header may lead to a linkage error.
2015-11-20 22:21:47 +09:00
