Commit Graph

723 Commits

Author SHA1 Message Date
8636eb749a Handle RIFF chunk padding and ignore trailing garbage
This is based on patches by Marc Halbruegge, but those only deal with
read-only cases. The code now also correctly adds padding to RIFF
chunks, and calculates offsets in chunkData taking the padding into
account.

BUG:171957
BUG:175781


git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@1003745 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2009-07-28 18:29:39 +00:00
834d9d6b23 Partial support for 64-bit atoms
We still can't handle actual 64-bit atoms, but we can handle 32-bit sizes
stored in 64 bits.

CCBUG:198730


git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@1001897 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2009-07-24 13:08:51 +00:00
097ae0d785 Use flac padding.
Updated patch from Toby Dickenson

BUG:107659


git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@995518 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2009-07-12 21:53:18 +00:00
7f0f90b4ea Make docs consistant with behavior.
BUG:178174


git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@995471 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2009-07-12 19:54:46 +00:00
f7fc585665 Don't save ID3v2.2 frames.
Patch by Marc Halbruegge
BUG:176373


git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@994842 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2009-07-11 14:43:58 +00:00
0f11c5ab0c Support for ID3v2.2 PIC frames
Patch by Marc Halbruegge
BUG:167786


git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@994836 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2009-07-11 14:27:17 +00:00
39e6891c92 Fix off-by-one error in ByteVectorList::split
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@994815 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2009-07-11 13:24:21 +00:00
5e1eb18df9 Try to read track also from TRACKNUM and year from YEAR.
Patch by David Bishop
BUG:144396


git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@994811 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2009-07-11 13:17:06 +00:00
59e35efc1b TCON parsing fixes
* Don't join multiple 2.4 TCON fields together
 * Don't add duplicate fields for 2.3 genres where the refinement matches the ID3v1 genre

Patch by Michael Smith
BUG:188578


git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@994805 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2009-07-11 12:55:36 +00:00
c92a02b0d7 One more check for invalid frame in AttachedPictureFrame::parseFields
Patch by Mook
BUG:168382


git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@994361 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2009-07-10 14:43:15 +00:00
b70e3b2304 Use floting point length to calculate bitrate from the Xing header information
Patch by Mook
BUG:172556


git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@994337 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2009-07-10 14:34:04 +00:00
bed793f703 Move external to anonsvn (http://svn.kde.org -> svn://anonsvn.kde.org)
BUG:195492


git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@991290 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2009-07-04 15:41:38 +00:00
be640ed19f Build on Haiku
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@990628 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2009-07-02 20:54:32 +00:00
b19a4cf81c .oga files were not processed. Fix this. The problem was that even if the extension was defined in defaultFileExtensions(), it was not defined in create() so the file was never processed. As a
nice side effect, it also fixes the Amarok bug that caused .oga files not to be picked up by the collection scanner.

BUG:178602


git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@983337 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2009-06-18 02:15:19 +00:00
901a427d1f Fix typo
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@982404 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2009-06-15 19:40:33 +00:00
c6e7812d37 not generate it on win32
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@980173 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2009-06-11 11:13:48 +00:00
98a9b850cf Compilation fix for Visual C++ .NET 2003 (msvc71)
Explanations:
/Zc:wchar_t is recognized by msvc71, /Zc:wchar_t- is not (the - is important and was introduced only with msvc >= msvc80)
Thus /Zc:wchar_t- is recognized as /Zc:wchar_t and this is not what we want :)
Default behavior of msvc71 is already /Zc:wchar_t-

Solution:
Test the msvc version and add the compiler flag only if compiler >= msvc80 (e.g MSVC_VERSION >= 1400)
Same for /D_CRT_SECURE_NO_DEPRECATE and /D_CRT_NONSTDC_NO_DEPRECATE, there were introduced with msvc >= msvc80

git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@978720 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2009-06-07 23:07:32 +00:00
fd20da2ef8 Fix a stupid crash inside mp4file.cpp (variable not initialized)
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@978719 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2009-06-07 23:05:11 +00:00
0974882ecd Simplify extension checking in FileRef
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@961189 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2009-04-29 16:00:39 +00:00
a9bce47f96 Add String:rfind
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@961188 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2009-04-29 15:57:05 +00:00
321997c399 Make FileRef handle the .mp4 extension, too
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@961181 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2009-04-29 15:46:23 +00:00
94a402395b Fix off-by-one error in MP4::Tag when looking for free padding to use
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@961160 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2009-04-29 15:12:19 +00:00
f1a16bcf0f Style and safety fixes backported from taglib-extras
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@961000 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2009-04-29 12:55:33 +00:00
40bdaedb71 This commit adds support for building taglib-extras against taglib during kdesupport build time. If kdesupport is not what is being built, the normal system taglib is used.
This adds forward includes to taglib; these may be very useful to other projects as well, since taglib's includes are rather spread out.  The README file in the include folder has instructions for regenerating them.


git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@952369 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2009-04-11 17:13:24 +00:00
33b939c76f Don't build ASF/MP4 FileRef tests if WITH_ASF/WITH_MP4 are undefined
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@945359 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2009-03-27 10:45:00 +00:00
1eace99153 Detach before appending a character
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@944552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2009-03-25 17:52:23 +00:00
98d2808c17 this modified version has the advantage that it compiles
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@942892 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2009-03-22 20:48:27 +00:00
fad967ae0b Less of The Big Ugly in the middle of the classes.
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@942880 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2009-03-22 19:27:38 +00:00
56e8766126 Added GCC pragma to suppress non-virtual dtor warning which is being preserved
to maintain BIC.



git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@942876 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2009-03-22 19:06:05 +00:00
36a398a156 Finish making .asf readable, thanks Lukas
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@937985 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2009-03-10 22:33:13 +00:00
f1fd227fce Several of us have seen .asf WMA files in the wild.
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@937972 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2009-03-10 22:02:20 +00:00
c918150b72 Generate config.h in builddir again, and fix compilation when compiling taglib alone
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@937935 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2009-03-10 20:27:59 +00:00
3ec42c7b84 Re-add building things depending on config.h by having it generate in the source tree instead of the build tree, so that when cmake uses a non-source build dir (as it's supposed to) it can actually find the file. I think this is messy, as AFAIK cmake shouldn't be modifying the contents of the source tree...any cmake gurus out there, feel free to let me know if there's a better way.
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@937552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2009-03-09 22:20:50 +00:00
f024f9ab1b This is surely an oversight; fix documentation
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@937541 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2009-03-09 21:53:46 +00:00
66b3a1a184 Patch from Josef Radinger fixing typo in debug message.
BUG:30212
CCMAIL:taglib-devel@kde.org


git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@911772 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2009-01-16 05:16:48 +00:00
4fbd7c5d93 revert last
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@909079 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2009-01-10 23:15:33 +00:00
3a390a11d0 Also counts as being empty.
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@909060 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2009-01-10 22:21:45 +00:00
16a7efcd1c remove debug line from mac os framework build file
CCMAIL:taglib-devel@kde.org


git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@907136 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2009-01-07 14:14:14 +00:00
fc80167a4f Fix build by copying strigis FindCppUnit.cmake to taglib. Build failed because CPPUNIT_LIBRARIES didn't
contain cppunits dependencies reported by cppunit-config.

git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@899928 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2008-12-21 21:46:41 +00:00
df3eb22060 Suppress warning about this check missing. if someone has a lower cmake version please check
and decrease the required version if successfull.

git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@899927 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2008-12-21 21:46:37 +00:00
27e3643d19 Should fix the build.
CCMAIL:tbscope@gmail.com


git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@892977 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2008-12-05 16:43:38 +00:00
977ec6d41f warnings--
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@892694 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2008-12-05 00:37:39 +00:00
e989d7ad1d fix warnings
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@892447 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2008-12-04 12:37:36 +00:00
e2c76396dd -INSTALL_DIR_NAME doesn't have to be set in the toplevel CMakeLists.txt, since it is already set as target property
-remove some unnecessary code
-use BIN_INSTALL_DIR for the RUNTIME destination

Alex




git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@891512 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2008-12-02 12:06:49 +00:00
5c0eb1d698 config.h doesn't exist, at least in my checkout, so explicitly defining HAVE_CONFIG_H was breaking build. I'm guessing this was a mistake, and should either be taken out, or
something needs to be fixed.

CCMAIL: lalinsky@gmail.com


git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@883891 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2008-11-13 19:23:56 +00:00
1bcb9a6cc7 Add default case switch to fix compiler warnings when ASF or MP4 are not defined.
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@883884 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2008-11-13 19:19:39 +00:00
5df6ef092b Add my old WMA and MP4 code. It is disabled by default, must be explicitly enabled to be compiled.
Scott: If you think this is really a bad idea, please revert.


git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@883108 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2008-11-12 08:17:11 +00:00
fa31fa29d7 typo
BUG:170036


git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@854564 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2008-08-29 19:59:26 +00:00
13fddc3974 Don't try to access the string list if the item type is a locator.
Allan, does this look correct?  (It at least fixes the crash...)

BUG:169810
CCMAIL:kde@carewolf.com


git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@852712 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2008-08-26 12:19:47 +00:00
d2a1cfa32d detach when using non-const operator[]
BUG:169389


git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@850657 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2008-08-21 22:56:44 +00:00