Commit Graph

677 Commits

Author SHA1 Message Date
bb61b43ba0 Merge branch 'master' into merge-master
Conflicts:
	taglib/mp4/mp4tag.cpp
	taglib/toolkit/taglib.h
	taglib/toolkit/tbytevector.cpp
	taglib/toolkit/tbytevector.h
	taglib/toolkit/tfile.cpp
	taglib/toolkit/tstring.cpp
	taglib/toolkit/tstring.h
	taglib/trueaudio/trueaudiofile.cpp
	taglib/wavpack/wavpackfile.cpp
	taglib/wavpack/wavpackfile.h
2013-04-16 14:16:54 +09:00
5e6285afab Bug fix for #132 2013-04-16 05:53:36 +09:00
88a0871784 Bug fix for #132 2013-04-16 04:06:29 +09:00
f5462e3e19 Add cross-platform byte order conversions 2013-04-16 00:12:37 +09:00
a3352fd899 Use the first instance of a MP4 atom (#126)
When a file contains multiple MP4 atoms with the same name, use the first
one. This is consistent with iTunes and other popular software.
2013-04-15 10:13:47 +02:00
4a85e1e1ca Allow the second byte of MPEG header to contain 0xFF
0xFF in the second byte means MPEG Version 1, Layer I, no CRC protection.

http://mpgedit.org/mpgedit/mpeg_format/MP3Format.html
2013-04-15 09:46:08 +02:00
94efe5c187 Merge pull request #116 from ufleisch/tagduplication
Parameter to disable duplication between ID3v1 and ID3v2 tags, #115.
2013-04-14 23:47:59 -07:00
86142343ee Fix VC++ specific warnings 2013-04-15 05:23:39 +09:00
b52cd44c25 Some improvements of String 2013-04-15 05:03:54 +09:00
781aa05f0e Merge ByteVector improvement made in pull request #122 2013-04-11 03:52:17 +09:00
a4e68a0304 Reduce unnecessary memory copies by ByteVector 2013-04-05 22:07:58 +09:00
27115557a0 Avoid possible iterators' out-of-range 2013-04-03 09:21:48 +09:00
86cee56f74 Merge pull request #118 from TsudaKageyu/fix-compile
Fix a compilation error
2013-03-24 14:18:49 -07:00
843a12a0c6 Fix a compilation error 2013-03-25 06:13:07 +09:00
265013ef5b Add a required target_link_libraries in Win32 2013-03-25 05:44:57 +09:00
703736fbcb Parameter to disable duplication between ID3v1 and ID3v2 tags, #115. 2013-03-23 13:56:31 +01:00
1618833a6b Fix a compilation error 2013-03-23 13:58:44 +09:00
56c85a2d68 Change the size type of containers from uint to size_t 2013-03-23 13:42:46 +09:00
83b6fdef72 Merge pull request #113 from TsudaKageyu/fix-ulong
Fix uses of ulong where 32-bit integers are expected
2013-03-21 19:27:31 -07:00
cd082cd8e3 Fix uses of ulong where 32-bit integers are expected 2013-03-22 11:17:10 +09:00
b744f66819 Merge pull request #112 from TsudaKageyu/string-data
Avoid resizing a buffer frequently in String::data()
2013-03-21 17:06:17 -07:00
2ed7a59d95 Avoid resizing buffer frequently in String::data() 2013-03-22 08:58:38 +09:00
e93696f573 Make String:null and ByteVector::null const. 2013-03-22 01:43:46 +09:00
b1dcdc5bd8 Refector ByteVector 2013-03-21 19:50:35 +09:00
b4df82a0b0 Merge pull request #109 from TsudaKageyu/taglib2
Fix GCC warnings in FileStream
2013-03-21 02:39:17 -07:00
be081d23d3 Fix GCC warnings in FileStream 2013-03-21 18:29:24 +09:00
62efb9ff17 Detect sizeof(wchar_t) at compile time 2013-03-21 14:43:03 +09:00
8cae2b9f28 Detect UTF-16 byte order at compile time 2013-03-21 10:21:52 +09:00
cab68e2152 Stop determining whether to enable C++11 features at compile time 2013-03-20 08:39:13 +09:00
96cf908232 Replace RefCounter with std::shared_ptr if possible 2013-03-19 21:36:08 +09:00
4e05923479 Removed null termination from return value of String::data() 2013-03-18 13:55:49 +09:00
c86ea7bdff Use the standard library to convert between UTF-8 and UTF-16 where possible 2013-03-18 13:34:20 +09:00
a842220fe6 Revert "Use the standard library to convert between UTF-8 and UTF-16 where possible"
This reverts commit 19ce4d0dfa.
2013-03-18 06:08:05 +09:00
19ce4d0dfa Use the standard library to convert between UTF-8 and UTF-16 where possible 2013-03-18 05:56:48 +09:00
6e3639de9e Avoid creating new String object when comparing 2013-03-18 02:51:11 +09:00
0792eedd12 Fix UTF-16 BOM detection 2013-03-17 20:47:58 +09:00
86b7cabf44 Fix UTF-16 decoding where wchar_t is not 16-bit 2013-03-17 20:27:32 +09:00
de19ad72ab Fixed CPU endian detection 2013-03-17 19:40:01 +09:00
9b19453059 Some improvements of String 2013-03-17 12:51:00 +09:00
dbd7c151d6 Fix buffer overrun 2013-03-17 12:41:47 +09:00
d3af7c0b02 Fix VC++ x64 warnings 2013-03-16 00:07:01 +09:00
64447598e5 Made the destructor of StringHandler virtual. 2013-02-23 00:36:41 +09:00
fba8f42588 Fix some VC spesific warnings 2013-02-22 19:29:02 +09:00
6029352c09 Merge pull request #96 from nightingale-media-player/master
Make textual lyric frames use UTF8
2013-01-20 07:56:30 -08:00
077208d17a Create UTF8-Lyrics per default. 2013-01-18 17:21:35 +01:00
08863dec0b Found and fixed more missing property interface forwarders.
Probably due to a copy-and-paste error the implementation of
File::removeUnsupportedProperties() contained cases for several type
which do not reimplement this method; for others the implementation was
missing and is now included.

In addition, the formats Speex and Opus suffered from the same bug as
OggFLAC in the commit before, which is now fixed.
2013-01-03 23:20:15 +01:00
80af92a715 Add forwarders for the property interface to Ogg::FLAC::File.
Fixes an infinite method resolution recursion in File::properties() and
File::setProperties(). Thanks to Sebastian Rachuj for pointing out this bug.
2013-01-03 23:00:17 +01:00
5578843220 Fixed a typo. 2013-01-03 22:54:12 +01:00
90fd336a22 Add TagUnion::removeUnsupportedProperties, further reducing SLOCs. :-) 2012-12-27 13:32:01 +01:00
fa38c805f5 Implemented TagUnion::properties() and made Tag::*properties* virtual.
This allows to remove several default implementations in types using
TagUnions.
2012-12-27 13:19:11 +01:00