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
ea55c8b5c1
Merge branch 'cmake-allow-BUILD_SHARED_LIBS-to-drive-ENABLE_STATIC' of https://github.com/tSed/taglib into tSed-cmake-allow-BUILD_SHARED_LIBS-to-drive-ENABLE_STATIC
...
# Conflicts:
# CMakeLists.txt
# examples/CMakeLists.txt
2015-12-02 14:21:58 +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
4b8e39e8f0
Merge branch 'fh1.m_AddBuildBindingsOption' of https://github.com/FestusHagen/taglib into FestusHagen-fh1.m_AddBuildBindingsOption
...
# Conflicts:
# CMakeLists.txt
2015-11-27 09:35:13 +09:00
0556b6ca33
Merge branch 'Examples' of https://github.com/MaxLeb/taglib into MaxLeb-Examples
...
# Conflicts:
# examples/tagwriter.cpp
2015-11-22 16:05:56 +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
0a90687805
add options R, I, D for replace/insert/delete of arbitrary tags
2015-09-23 14:11:40 +02:00
6dbc340899
Examples: adds picture handling
2015-09-09 10:20:03 +02:00
35d5ba4eff
Add BUILD_BINDINGS option, moved if(BUILD_EXAMPLES) to taglib/CMakeLists, plus some cleanup.
2015-08-06 17:26:37 -04:00
00c6e7ea79
cmake: use BUILD_SHARED_LIBS instead of ENABLE_STATIC to drive the shared object build
...
In case ENABLE_STATIC is still set on the CMake command line, this
change will makes CMake bail out becaus e this option is no longer
supported.
This patch makes taglib more compliant with the distro package framework
that uses the standards CMake options.
Signed-off-by: Samuel Martin <s.martin49@gmail.com >
2015-06-01 19:27:05 +02:00
f0e8f39de1
Merge branch 'master' into merge-master-to-taglib2
...
Conflicts:
ConfigureChecks.cmake
taglib/toolkit/tbytevector.cpp
taglib/toolkit/tstring.cpp
taglib/xm/xmfile.cpp
tests/test_wav.cpp
2014-08-22 13:54:02 +09:00
2971891c69
Reduce useless detach operations by making some non-const iterators const.
2014-08-21 16:35:35 +09:00
50b55a8a94
Merge branch 'master' into merge-master-to-taglib2
...
Conflicts:
taglib/ogg/opus/opusproperties.cpp
2014-03-10 11:42:05 +09:00
05e0081414
Avoid using sprintf() in tagreader.cpp to fix an MSVC warning.
2014-02-19 23:35:23 +09:00
829f460c3c
Merge branch 'master' into merge-master
...
Conflicts:
taglib/toolkit/tbytevector.cpp
taglib/toolkit/tstring.cpp
2013-09-07 13:06:24 +09:00
4d126c49e9
Fixed a crash of APE::Item::toString() when the data type is binary
2013-07-14 02:47:48 +09:00
db892c43e7
Merge branch 'master' into taglib2
...
Conflicts:
taglib/mp4/mp4tag.cpp
taglib/mp4/mp4tag.h
taglib/toolkit/tfile.cpp
2012-11-23 10:17:16 +01:00
15b601f053
Use PropertyMap in tagreader
2012-11-21 14:40:26 +01:00
60ba972244
Make the toString() method virtual
2012-11-12 16:22:23 +01:00
e8ae4ecd93
Revert "Revert "Add a tool to inspect audio files, only MP4 is implemented for now""
...
This reverts commit c6f7ad3e83
2012-11-12 16:16:31 +01:00
c6f7ad3e83
Revert "Add a tool to inspect audio files, only MP4 is implemented for now"
...
This reverts commit 45b0279b41
2012-11-12 16:14:32 +01:00
45b0279b41
Add a tool to inspect audio files, only MP4 is implemented for now
2012-11-11 16:43:36 +01:00
050ff3835d
Revert "Install examples if built."
...
This reverts commit 52e96e48c5
2012-07-14 21:06:53 +02:00
52e96e48c5
Install examples if built.
2012-05-16 04:37:25 +10:00
2f9838a440
*poof*
...
I've warned people about removing autoconf/automake support for a long time,
so let's make it happen for 1.7. CMake is now the only supported build system.
I'll update build docs in a following commit.
CCMAIL:taglib-devel@kde.org
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@1220235 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2011-02-13 11:50:25 +00:00
004551faec
Fix tagreader_c.c to not try to access invalid pointers
...
BUG:218334
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@1061671 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2009-12-12 16:44:34 +00:00
db3db34e21
Fix building of examples with ENABLE_STATIC
...
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@1021651 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2009-09-09 18:16:38 +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
705fa9d79b
Fix compilation on MSVC/Windows
...
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@777124 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2008-02-19 19:52:04 +00:00
aedbaeaf5a
show ape tags in the framelist
...
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@769307 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2008-02-01 04:15:59 +00:00
bb9e6fe65f
Split BUILD_TESTS to BUILD_TESTS and BUILD_EXAMPLES.
...
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@740072 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2007-11-22 13:20:21 +00:00
0da49842dd
SVN_SILENT didn't mean for that to go in
...
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@727756 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2007-10-21 17:37:28 +00:00
1bdb67fafa
More TAGLIB_EXPORTs from Lukas.
...
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@727755 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2007-10-21 17:35:40 +00:00
317de487ba
Still need the C++ runtime for the C bindings on Solaris; need stdlib.h for various prototypes.
...
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@705364 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2007-08-27 20:05:44 +00:00
26751ba95b
the usual daily unbreak compilation
...
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@670244 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2007-05-31 20:51:55 +00:00
245a8af778
fix make install - I guess examples shouldn't actually be installed
...
(I see that Makefile.am required "make examples" explicitly)
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@594795 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2006-10-12 10:50:45 +00:00
4edbc93494
Change the taglib build system to use relative include paths.
...
This allows you to build taglib either as part of kdesupport
(i.e. with a source directory of kdesupport/) or by itself
(i.e. with a source directory of kdesupport/taglib/).
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@593544 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2006-10-08 06:28:19 +00:00
9dd4bf063e
Add support for examples
...
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@592362 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2006-10-04 15:21:01 +00:00
619b1eaf54
Add tests directory into build
...
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@592361 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2006-10-04 15:12:47 +00:00
f162c5f5f9
And now get everything building again...
...
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@588037 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2006-09-24 18:10:30 +00:00
9a2f90be89
Re-add automake/autoconf stuff. I'm tempted to delete the CMake stuff while I'm
...
at it, but I'll leave it for now...
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@587989 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2006-09-24 16:17:47 +00:00
0b428130f3
Now taglib compiles with cmake
...
Remove old build system
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@587949 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2006-09-24 14:45:33 +00:00
d3d4061adc
Fix CMakefiles
...
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@586716 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2006-09-20 12:57:59 +00:00
e3cf99c87a
Add cmake support
...
All compile need to test now
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@586714 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2006-09-20 12:52:28 +00:00
c125032f0e
...or this
...
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@402894 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2005-04-03 16:37:56 +00:00
9b1eb2f5d6
Didn't mean to check this in.
...
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@402892 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2005-04-03 16:36:17 +00:00
60f73eb537
fix memory leaks
...
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@402891 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2005-04-03 16:35:55 +00:00
20fb2bd1ec
Don't try to do stuff to files that aren't valid.
...
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@344196 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2004-09-05 17:54:00 +00:00
c22ee9d712
CVS_SILENT oops -- didn't mean to check this in
...
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@289568 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2004-02-20 01:42:10 +00:00
619ef906cd
Mostly get ID3v2.2 working. Sure, it's a standard from 1998 that was
...
replaced in 1999, but apparently iTunes still uses it.
This gets the frame parsing code to support 2.2 and required deprecating
a couple of methods so that an ID3v2 version could be passed along.
There still needs to be a translation table added to handle converting
ID3v2.2 frame names to their ID3v2.4 equivalents, but that can come later.
For now the framelister program from the examples dir is able to read all
of the text frames.
CCMAIL:Keith Brady <keith@funnelboy.org >
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@289567 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
2004-02-20 01:41:25 +00:00
