1505 Commits

Author SHA1 Message Date
Lukáš Lalinský
3cea7f267a Merge pull request #381 from TsudaKageyu/merge-master-to-taglib2
Merged master into taglib2.
2014-04-11 13:01:57 +02:00
Tsuda Kageyu
1a9c49e42b Merge branch 'master' into merge-master-to-taglib2
Conflicts:
	taglib/asf/asftag.cpp
	taglib/mp4/mp4tag.cpp
	taglib/toolkit/tstring.h
2014-04-11 18:31:49 +09:00
Lukáš Lalinský
ecc768d459 Merge pull request #380 from TsudaKageyu/fix-comment
Removed a wrong note from a comment in tstring.h.
2014-04-11 10:33:56 +02:00
Tsuda Kageyu
fabc411cb9 Removed a wrong note from a comment in tstring.h. 2014-04-11 17:16:55 +09:00
Lukáš Lalinský
fbbebfcec6 Merge pull request #376 from TsudaKageyu/test-float80
Added a missing test for ByteVector::toFloat80().
2014-04-10 20:10:39 +02:00
Lukáš Lalinský
7f20c95cfc Merge pull request #374 from TsudaKageyu/redundant-smartptr
Removed some redundant code from tsmartptr.h.
2014-04-10 20:10:19 +02:00
Lukáš Lalinský
98c6088f91 Merge pull request #363 from TsudaKageyu/string-std-func
Simplified some functions in tstring.cpp by replacing with standard func...
2014-04-10 20:09:45 +02:00
Lukáš Lalinský
2d528d844a Merge pull request #356 from TsudaKageyu/string-comment
Added some comment about UTF-16 encoding to String::data().
2014-04-10 20:05:55 +02:00
Lukáš Lalinský
c65753c766 Add ALBUMARTIST property mapping for WMA 2014-04-10 20:05:14 +02:00
Lukáš Lalinský
22f8b527f7 Merge pull request #373 from TsudaKageyu/snprintf-spelling
Fixed some misspellings.
2014-04-10 20:04:37 +02:00
Lukáš Lalinský
7e10b13962 Merge pull request #372 from TsudaKageyu/cmake-warning
Suppressed the warning "Policy CMP0022 is not set" on CMake 2.8.12.
2014-04-10 20:04:17 +02:00
Lukáš Lalinský
05e26119f7 Merge pull request #377 from amigadave/master
Add ALBUMARTIST property mapping for MP4
2014-04-10 20:01:36 +02:00
David King
95a59c416b Add ALBUMARTIST property mapping for MP4
https://code.google.com/p/mp4v2/wiki/iTunesMetadata
2014-04-10 17:33:29 +01:00
Tsuda Kageyu
65beb8cc06 Fixed a wrong conversion in ByteVector::toFloat64BE(). 2014-04-09 14:46:42 +09:00
Tsuda Kageyu
c94d482215 Added a missing test for ByteVector::toFloat80(). 2014-04-09 14:46:42 +09:00
Tsuda Kageyu
d05101153f Fixed some misspellings. 2014-04-07 16:09:12 +09:00
Tsuda Kageyu
bceb568ea8 Removed some redundant code from tsmartptr.h. 2014-04-07 16:05:35 +09:00
Tsuda Kageyu
3f557be608 Suppressed the warning "Policy CMP0022 is not set" on CMake 2.8.12. 2014-04-05 21:08:21 +09:00
Lukáš Lalinský
9ca7877587 Merge pull request #371 from TsudaKageyu/cmake-ver
Changed cmake_minimum_required from 2.6.0 to 2.8.0.
2014-04-05 13:07:58 +02:00
Tsuda Kageyu
a93ee10134 Changed cmake_minimum_required from 2.6.0 to 2.8.0. 2014-04-05 19:44:47 +09:00
Lukáš Lalinský
8390a91e48 Merge pull request #366 from TsudaKageyu/missing-ifdef
Added missing #ifdef HAVE_CONFIG_H
2014-04-04 09:37:55 +02:00
Lukáš Lalinský
4dca1ab68c Merge pull request #369 from TsudaKageyu/remove-switches
Removed some CMake switches which are no longer used.
2014-04-04 09:37:33 +02:00
Lukáš Lalinský
3ced5e92b7 Merge pull request #368 from TsudaKageyu/remove-shlwapi
Removed an unnecessary dependency on shlwapi.lib.
2014-04-04 09:37:20 +02:00
Tsuda Kageyu
dce1664f30 Removed some CMake switches which are no longer used. 2014-04-04 01:12:47 +09:00
Tsuda Kageyu
a303d88782 Removed an unnecessary dependency on shlwapi.lib. 2014-04-04 00:56:27 +09:00
Tsuda Kageyu
8b77051ecf Added missing #ifdef HAVE_CONFIG_H 2014-04-02 22:25:56 +09:00
Lukáš Lalinský
329abdbce7 Merge pull request #365 from TsudaKageyu/remove-cmake-float
Removed some unnecessary CMake checks for the size of numeric types.
2014-04-02 09:36:12 +02:00
Tsuda Kageyu
d3eefdde34 Removed some unnecessary CMake checks for the size of numeric types. 2014-04-02 14:03:35 +09:00
Tsuda Kageyu
c5353ed5ef Added UTF-8 check when constructing a String from a char. 2014-04-02 01:45:23 +09:00
Tsuda Kageyu
5199a3cbb6 Simplified some functions in tstring.cpp by replacing with standard functions. 2014-04-01 18:03:19 +09:00
Lukáš Lalinský
16b8688c1a Merge pull request #362 from ufleisch/master
Add support for synchronized lyrics (SYLT) and event timing codes (ETCO) for ID3v2
2014-03-30 19:21:47 +02:00
Urs Fleisch
3b60af2c0b Add support for ID3v2 ETCO frames (event timing codes). 2014-03-30 09:28:14 +02:00
Urs Fleisch
eba99c3a70 Add support for ID3v2 SYLT frames (synchronized lyrics). 2014-03-30 09:26:03 +02:00
Tsuda Kageyu
6bcd422afa Small fix of a comment 2014-03-14 15:12:03 +09:00
Tsuda Kageyu
c357d293a1 Added some comment about UTF-16 encoding to String::data(). 2014-03-13 14:38:03 +09:00
Lukáš Lalinský
d93b4af8ca Merge pull request #326 from TsudaKageyu/msvc-dsf
Fixed some MSVC warnings in DSF related classes
2014-03-10 07:25:17 +01:00
Lukáš Lalinský
dd1a885f27 Merge pull request #355 from TsudaKageyu/merge-master-to-taglib2
Merge master to taglib2
2014-03-10 07:23:48 +01:00
Tsuda Kageyu
50b55a8a94 Merge branch 'master' into merge-master-to-taglib2
Conflicts:
	taglib/ogg/opus/opusproperties.cpp
2014-03-10 11:42:05 +09:00
Stephen F. Booth
cfb43223dc Merge pull request #354 from TsudaKageyu/opus-bitrate
opus: Estimate the bitrate if possible
2014-03-09 21:37:50 -04:00
Tsuda Kageyu
72cd379f30 opus: Estimate the bitrate if possible 2014-03-10 09:37:10 +09:00
Lukáš Lalinský
a3d724af27 Merge pull request #352 from TsudaKageyu/tagreader-sprintf
Avoid using sprintf() in tagreader.cpp to fix an MSVC warning.
2014-02-19 16:34:42 +01:00
Tsuda Kageyu
05e0081414 Avoid using sprintf() in tagreader.cpp to fix an MSVC warning. 2014-02-19 23:35:23 +09:00
Lukáš Lalinský
5d519c5207 Merge pull request #350 from TsudaKageyu/merge-master-to-taglib2
Merge master to taglib2
2014-02-18 10:27:45 +01:00
Tsuda Kageyu
bd84c8928a Merge branch 'master' into merge-master-to-taglib2
Conflicts:
	taglib/riff/wav/infotag.cpp
	taglib/toolkit/trefcounter.h
	taglib/toolkit/tstring.cpp
	taglib/toolkit/tstring.h
	taglib/xm/xmfile.cpp
	tests/test_string.cpp
2014-02-18 17:32:05 +09:00
Lukáš Lalinský
b658f95e06 Merge pull request #338 from funman/master
Also build/install taglib_c.pc when targetting windows
2014-02-17 08:46:13 +01:00
Lukáš Lalinský
2758aed34d Merge pull request #348 from TsudaKageyu/string-memcpy
Reduced a useless memory copy in tstring.cpp.
2014-02-17 08:45:49 +01:00
Lukáš Lalinský
12b25868b7 Merge pull request #349 from TsudaKageyu/install-typo
Fixed a typo in INSTALL.
2014-02-17 08:44:54 +01:00
Tsuda Kageyu
1deff52d95 Fixed a typo in INSTALL. 2014-02-17 11:22:40 +09:00
Tsuda Kageyu
69eaa75f64 Reduced a useless memory copy in tstring.cpp. 2014-02-15 20:25:00 +09:00
Lukáš Lalinský
3e0c73bdbc Merge pull request #347 from TsudaKageyu/xm-seek
Changed XM::File::save() to use seek() properly.
2014-02-14 17:21:49 +01:00