e9f70a59b2
Merge branch 'genversion' of https://github.com/ufleisch/taglib into ufleisch-genversion
...
# Conflicts:
# CMakeLists.txt
2015-11-22 10:38:35 +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
ef3ce1e38a
Style fixes in fileref.cpp.
2015-11-21 17:06:26 +09:00
8724184d56
Fix a typo in a comment.
2015-11-21 10:32:32 +09:00
61dabe61a7
Update NEWS.
2015-11-21 10:30:48 +09:00
de0fc83066
Style fixes in fileref.cpp.
2015-11-21 10:29:37 +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
b592f78238
Unify common functions for finding tags.
...
Several classes have exactly identical functions for finding tags.
This also hides the functions from public headers.
2015-11-21 09:30:04 +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
ce1c03faa3
Update NEWS.
2015-11-20 23:08:43 +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
c4fe65787c
Avoid using String::isNull() where it is considered to be confused with isEmpty().
2015-11-20 20:59:13 +09:00
1d0552cab1
Change String::npos from a variable to a function.
...
We can't export a static member function. It may lead to a linkage error.
2015-11-20 16:46:02 +09:00
bb49005267
Fix a mismatch between the CMake check and the actual code.
2015-11-20 15:28:38 +09:00
47cb23d738
Merge branch 'master' into merge-master-to-taglib2
...
# Conflicts:
# taglib/ape/apefile.cpp
# taglib/asf/asffile.cpp
# taglib/asf/asftag.cpp
# taglib/flac/flacfile.cpp
# taglib/mp4/mp4tag.cpp
# taglib/mpc/mpcfile.cpp
# taglib/mpeg/mpegfile.cpp
# taglib/mpeg/mpegfile.h
# taglib/riff/wav/wavfile.cpp
# taglib/tagunion.cpp
# taglib/tagunion.h
# taglib/trueaudio/trueaudiofile.cpp
# taglib/wavpack/wavpackfile.cpp
2015-11-20 15:17:39 +09:00
29b0568dec
Revert "Add a test about handing "COMMENT" and "DESCIPRION" fields in XiphComment."
...
This reverts commit 8f147034d6
2015-11-20 14:18:40 +09:00
7d0a651f3e
Revert "Use always "COMMENT" field when updating XiphComment."
...
This reverts commit ba5137bf2d
2015-11-20 14:18:23 +09:00
224f133d65
Merge pull request #643 from TsudaKageyu/save-asf
...
Avoid writing duplicate tags when saving ASF files.
2015-11-20 13:52:33 +09:00
f956c89141
Remove a warning from a comment and update NEWS.
2015-11-20 13:48:51 +09:00
6dc8d701a8
Avoid writing duplicate tags when saving ASF files.
...
Reduce memory reallocations and copies when saving ASF files.
2015-11-20 13:48:25 +09:00
779f904940
Update NEWS.
2015-11-20 13:35:07 +09:00
4161746d89
Update NEWS.
2015-11-20 13:25:28 +09:00
6d5654028a
Merge pull request #642 from TsudaKageyu/strip-and-properties
...
Fix segfaults when calling File::properties() after strip().
2015-11-20 13:24:01 +09:00
93d55dafd6
Update NEWS.
2015-11-20 10:50:21 +09:00
e1e1b6c60c
Merge pull request #623 from TsudaKageyu/erase-duplicate-id3v2
...
Skip duplicate ID3v2 tags and treat them as an extra blank of the first one.
2015-11-20 10:49:11 +09:00
1cc3e4cc57
Consistent rounding when calculating the MP4 audio length.
2015-11-19 18:24:20 +09:00
f310b1810d
Update NEWS.
2015-11-19 17:55:18 +09:00
e10684312e
Efficient lookup for an ID3v2 tag in a MPEG file.
...
An ID3v2 tag or MPEG frame is most likely be at the beginning of the file.
2015-11-19 17:31:51 +09:00
a3564d8c68
Efficient lookup for the MP4/ASF field name and ID3v1 genre tables.
...
Linear lookup is much faster and memory efficient when an array is very small.
2015-11-19 16:35:55 +09:00
95ef0e7882
Add some tests for String::toInt() with too large values.
2015-11-19 14:52:02 +09:00
13a258d9ed
Backport shorter versions of some functions from taglib2.
2015-11-19 14:45:36 +09:00
d37c081cda
Fix compilation errors on Clang.
2015-11-19 14:20:51 +09:00
dbe3a03b62
Hide string handler implementations from public headers.
2015-11-19 14:08:40 +09:00
5da35f5a51
Rename RIFF::Info::FieldListMap to FieldMap.
...
It doesn't contain string lists.
2015-11-19 13:47:41 +09:00
176e133f32
Change ByteVector::npos from a variable to a function.
...
We can't export a static member function. It may lead to a likage error.
2015-11-19 13:13:15 +09:00
722f317f97
Remove ByteVector::null and isNull().
2015-11-19 11:57:30 +09:00
72a807def1
Fix a string conversion bug in tag_c.cpp.
2015-11-19 11:50:39 +09:00
c2753f8d3c
Merge branch 'master' into merge-master-to-taglib2
...
# Conflicts:
# ConfigureChecks.cmake
# bindings/c/tag_c.cpp
# taglib-config.cmd.cmake
# taglib/asf/asfattribute.cpp
# taglib/asf/asffile.cpp
# taglib/audioproperties.cpp
# taglib/mp4/mp4atom.h
# taglib/mp4/mp4coverart.cpp
# taglib/mp4/mp4file.cpp
# taglib/mp4/mp4item.cpp
# taglib/mp4/mp4tag.cpp
# taglib/mpeg/id3v2/id3v2frame.cpp
# taglib/mpeg/id3v2/id3v2tag.cpp
# taglib/toolkit/tbytevector.cpp
# taglib/toolkit/tbytevector.h
# taglib/toolkit/tfile.cpp
# taglib/toolkit/tfile.h
# taglib/toolkit/tlist.h
# taglib/toolkit/tstring.cpp
# taglib/toolkit/tstring.h
# tests/test_apetag.cpp
2015-11-19 11:37:18 +09:00
539d951277
Avoid using ByteVector::null where an empty vector is required.
...
ByteVector::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-19 10:52:46 +09:00
21788f4a26
Efficient lookup for the ID3v2 frame ID table.
...
Linear lookup is much faster and memory efficient when an array is very small.
2015-11-19 10:07:10 +09:00
74cb6f3fc7
Merge pull request #493 from TsudaKageyu/nested-refcounter
...
Simplify overly complicated ByteVector::mid() implementation.
2015-11-19 09:37:40 +09:00
e0f1151c5c
Resolve some conflicts before merging.
2015-11-19 09:27:15 +09:00
10e1fcd686
Consistent notations between ByteVector::data() and at().
2015-11-19 09:23:20 +09:00
3bce77a359
Use linear search instead of the Knuth-Morris-Pratt algorithm in ByteVector::find().
...
In almost all cases, it handles too small data for KMP to work effectively.
2015-11-19 09:23:19 +09:00
0ffd2e8ab9
Replace DATA macro with more straightforward notations.
2015-11-19 09:23:19 +09:00
7e85d9b202
Simplify overly complicated ByteVector::mid() implementation.
...
Especially remove the useless nested RefCounters.
2015-11-19 09:23:19 +09:00
c6443dabc6
Use the same type name between a List and its iterator.
2015-11-18 17:58:13 +09:00
da7424636b
Fix a mismatch between List and iterator types.
2015-11-18 17:50:48 +09:00
