diff options
58 files changed, 62 insertions, 24 deletions
diff --git a/SConstruct b/SConstruct index 3b906a79f4..2d4651994d 100644 --- a/SConstruct +++ b/SConstruct @@ -1221,7 +1221,7 @@ else: CPPPATH=['#libs', '#libs/soundtouch']) libraries['taglib'] = LibraryInfo(LIBS='libtaglib', LIBPATH='#libs/taglib', - CPPPATH=['#libs/taglib/headers','#libs/taglib/headers/taglib']) + CPPPATH=['#libs/taglib', '#libs/taglib/taglib']) # libraries['libglademm'] = LibraryInfo(LIBS='libglademm', # LIBPATH='#libs/libglademm', # CPPPATH='#libs/libglademm') diff --git a/libs/ardour/ardour/audiofile_tagger.h b/libs/ardour/ardour/audiofile_tagger.h index 970b5c4593..13e6671068 100644 --- a/libs/ardour/ardour/audiofile_tagger.h +++ b/libs/ardour/ardour/audiofile_tagger.h @@ -23,9 +23,9 @@ #include <string> -#include "taglib/ogg/xiphcomment.h" #include "taglib/tag.h" -#include "taglib/toolkit/taglib.h" +#include "taglib/taglib.h" +#include "taglib/xiphcomment.h" using std::string; diff --git a/libs/ardour/audiofile_tagger.cc b/libs/ardour/audiofile_tagger.cc index 6d66a5de8c..cfd839fc0c 100644 --- a/libs/ardour/audiofile_tagger.cc +++ b/libs/ardour/audiofile_tagger.cc @@ -25,11 +25,11 @@ #include "pbd/convert.h" #include "taglib/fileref.h" -#include "taglib/flac/flacfile.h" -#include "taglib/ogg/oggfile.h" -#include "taglib/ogg/xiphcomment.h" +#include "taglib/flacfile.h" +#include "taglib/oggfile.h" #include "taglib/tag.h" -#include "taglib/toolkit/taglib.h" +#include "taglib/taglib.h" +#include "taglib/xiphcomment.h" /* Convert Glib::ustring to TagLib::String */ #define TL_STR(ustring) TagLib::String ((ustring).c_str(), TagLib::String::UTF8) diff --git a/libs/taglib/SConscript b/libs/taglib/SConscript index 26c90aaba9..2543bed4a8 100644 --- a/libs/taglib/SConscript +++ b/libs/taglib/SConscript @@ -112,25 +112,9 @@ taglib/wavpack/wavpackproperties.h libtaglib = taglib.SharedLibrary ('taglib', taglib_files) -# -# the header structure of this library is not very convenient -# if you don't want to install the library. headers are distributed -# all over the place, making a simple -Ipath flag for the compiler -# rather difficult. This hack creates a directory and copies -# the headers into it, allowing us to use -I#libs/taglib/headers -# - -def headercopy(env, target, source): - if os.access (str(target[0]), os.X_OK) != True: - os.makedirs (str(target[0])) - for file in source : - copy (str(file), str(target[0])) - -header_dir = taglib.Command ('#libs/taglib/headers/taglib', headers, headercopy) - config_h = taglib.Command('config.h', ['config.h.in'], 'cd libs/taglib && ./configure && cd -', ENV=os.environ) -Default([config_h,header_dir,libtaglib]) +Default([config_h,libtaglib]) env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libtaglib)) diff --git a/libs/taglib/taglib/apefooter.h b/libs/taglib/taglib/apefooter.h new file mode 120000 index 0000000000..4478ae1861 --- /dev/null +++ b/libs/taglib/taglib/apefooter.h @@ -0,0 +1 @@ +./ape/apefooter.h
\ No newline at end of file diff --git a/libs/taglib/taglib/apeitem.h b/libs/taglib/taglib/apeitem.h new file mode 120000 index 0000000000..4b5757ca25 --- /dev/null +++ b/libs/taglib/taglib/apeitem.h @@ -0,0 +1 @@ +./ape/apeitem.h
\ No newline at end of file diff --git a/libs/taglib/taglib/apetag.h b/libs/taglib/taglib/apetag.h new file mode 120000 index 0000000000..6e08d878ca --- /dev/null +++ b/libs/taglib/taglib/apetag.h @@ -0,0 +1 @@ +./ape/apetag.h
\ No newline at end of file diff --git a/libs/taglib/taglib/attachedpictureframe.h b/libs/taglib/taglib/attachedpictureframe.h new file mode 120000 index 0000000000..f48f568c55 --- /dev/null +++ b/libs/taglib/taglib/attachedpictureframe.h @@ -0,0 +1 @@ +./mpeg/id3v2/frames/attachedpictureframe.h
\ No newline at end of file diff --git a/libs/taglib/taglib/commentsframe.h b/libs/taglib/taglib/commentsframe.h new file mode 120000 index 0000000000..54c9c1d848 --- /dev/null +++ b/libs/taglib/taglib/commentsframe.h @@ -0,0 +1 @@ +./mpeg/id3v2/frames/commentsframe.h
\ No newline at end of file diff --git a/libs/taglib/taglib/flacfile.h b/libs/taglib/taglib/flacfile.h new file mode 120000 index 0000000000..163f8fe06b --- /dev/null +++ b/libs/taglib/taglib/flacfile.h @@ -0,0 +1 @@ +./flac/flacfile.h
\ No newline at end of file diff --git a/libs/taglib/taglib/flacproperties.h b/libs/taglib/taglib/flacproperties.h new file mode 120000 index 0000000000..3f2524267c --- /dev/null +++ b/libs/taglib/taglib/flacproperties.h @@ -0,0 +1 @@ +./flac/flacproperties.h
\ No newline at end of file diff --git a/libs/taglib/taglib/generalencapsulatedobjectframe.h b/libs/taglib/taglib/generalencapsulatedobjectframe.h new file mode 120000 index 0000000000..dbb35ace6a --- /dev/null +++ b/libs/taglib/taglib/generalencapsulatedobjectframe.h @@ -0,0 +1 @@ +./mpeg/id3v2/frames/generalencapsulatedobjectframe.h
\ No newline at end of file diff --git a/libs/taglib/taglib/id3v1genres.h b/libs/taglib/taglib/id3v1genres.h new file mode 120000 index 0000000000..a6e5fa27d5 --- /dev/null +++ b/libs/taglib/taglib/id3v1genres.h @@ -0,0 +1 @@ +./mpeg/id3v1/id3v1genres.h
\ No newline at end of file diff --git a/libs/taglib/taglib/id3v1tag.h b/libs/taglib/taglib/id3v1tag.h new file mode 120000 index 0000000000..0843ca4c7b --- /dev/null +++ b/libs/taglib/taglib/id3v1tag.h @@ -0,0 +1 @@ +./mpeg/id3v1/id3v1tag.h
\ No newline at end of file diff --git a/libs/taglib/taglib/id3v2extendedheader.h b/libs/taglib/taglib/id3v2extendedheader.h new file mode 120000 index 0000000000..ce495056cf --- /dev/null +++ b/libs/taglib/taglib/id3v2extendedheader.h @@ -0,0 +1 @@ +./mpeg/id3v2/id3v2extendedheader.h
\ No newline at end of file diff --git a/libs/taglib/taglib/id3v2footer.h b/libs/taglib/taglib/id3v2footer.h new file mode 120000 index 0000000000..ad6745fd9e --- /dev/null +++ b/libs/taglib/taglib/id3v2footer.h @@ -0,0 +1 @@ +./mpeg/id3v2/id3v2footer.h
\ No newline at end of file diff --git a/libs/taglib/taglib/id3v2frame.h b/libs/taglib/taglib/id3v2frame.h new file mode 120000 index 0000000000..cbb258be8c --- /dev/null +++ b/libs/taglib/taglib/id3v2frame.h @@ -0,0 +1 @@ +./mpeg/id3v2/id3v2frame.h
\ No newline at end of file diff --git a/libs/taglib/taglib/id3v2framefactory.h b/libs/taglib/taglib/id3v2framefactory.h new file mode 120000 index 0000000000..32fcfab860 --- /dev/null +++ b/libs/taglib/taglib/id3v2framefactory.h @@ -0,0 +1 @@ +./mpeg/id3v2/id3v2framefactory.h
\ No newline at end of file diff --git a/libs/taglib/taglib/id3v2header.h b/libs/taglib/taglib/id3v2header.h new file mode 120000 index 0000000000..90639420a4 --- /dev/null +++ b/libs/taglib/taglib/id3v2header.h @@ -0,0 +1 @@ +./mpeg/id3v2/id3v2header.h
\ No newline at end of file diff --git a/libs/taglib/taglib/id3v2synchdata.h b/libs/taglib/taglib/id3v2synchdata.h new file mode 120000 index 0000000000..45374981b4 --- /dev/null +++ b/libs/taglib/taglib/id3v2synchdata.h @@ -0,0 +1 @@ +./mpeg/id3v2/id3v2synchdata.h
\ No newline at end of file diff --git a/libs/taglib/taglib/id3v2tag.h b/libs/taglib/taglib/id3v2tag.h new file mode 120000 index 0000000000..e9b6219657 --- /dev/null +++ b/libs/taglib/taglib/id3v2tag.h @@ -0,0 +1 @@ +./mpeg/id3v2/id3v2tag.h
\ No newline at end of file diff --git a/libs/taglib/taglib/mpcfile.h b/libs/taglib/taglib/mpcfile.h new file mode 120000 index 0000000000..3f31e3d713 --- /dev/null +++ b/libs/taglib/taglib/mpcfile.h @@ -0,0 +1 @@ +./mpc/mpcfile.h
\ No newline at end of file diff --git a/libs/taglib/taglib/mpcproperties.h b/libs/taglib/taglib/mpcproperties.h new file mode 120000 index 0000000000..81f0916dfc --- /dev/null +++ b/libs/taglib/taglib/mpcproperties.h @@ -0,0 +1 @@ +./mpc/mpcproperties.h
\ No newline at end of file diff --git a/libs/taglib/taglib/mpegfile.h b/libs/taglib/taglib/mpegfile.h new file mode 120000 index 0000000000..9906423f74 --- /dev/null +++ b/libs/taglib/taglib/mpegfile.h @@ -0,0 +1 @@ +./mpeg/mpegfile.h
\ No newline at end of file diff --git a/libs/taglib/taglib/mpegheader.h b/libs/taglib/taglib/mpegheader.h new file mode 120000 index 0000000000..beb79d9d17 --- /dev/null +++ b/libs/taglib/taglib/mpegheader.h @@ -0,0 +1 @@ +./mpeg/mpegheader.h
\ No newline at end of file diff --git a/libs/taglib/taglib/mpegproperties.h b/libs/taglib/taglib/mpegproperties.h new file mode 120000 index 0000000000..ca2391c005 --- /dev/null +++ b/libs/taglib/taglib/mpegproperties.h @@ -0,0 +1 @@ +./mpeg/mpegproperties.h
\ No newline at end of file diff --git a/libs/taglib/taglib/oggfile.h b/libs/taglib/taglib/oggfile.h new file mode 120000 index 0000000000..629411e4a6 --- /dev/null +++ b/libs/taglib/taglib/oggfile.h @@ -0,0 +1 @@ +./ogg/oggfile.h
\ No newline at end of file diff --git a/libs/taglib/taglib/oggflacfile.h b/libs/taglib/taglib/oggflacfile.h new file mode 120000 index 0000000000..a637866754 --- /dev/null +++ b/libs/taglib/taglib/oggflacfile.h @@ -0,0 +1 @@ +./ogg/flac/oggflacfile.h
\ No newline at end of file diff --git a/libs/taglib/taglib/oggpage.h b/libs/taglib/taglib/oggpage.h new file mode 120000 index 0000000000..c1d996bd86 --- /dev/null +++ b/libs/taglib/taglib/oggpage.h @@ -0,0 +1 @@ +./ogg/oggpage.h
\ No newline at end of file diff --git a/libs/taglib/taglib/oggpageheader.h b/libs/taglib/taglib/oggpageheader.h new file mode 120000 index 0000000000..1bb403504c --- /dev/null +++ b/libs/taglib/taglib/oggpageheader.h @@ -0,0 +1 @@ +./ogg/oggpageheader.h
\ No newline at end of file diff --git a/libs/taglib/taglib/relativevolumeframe.h b/libs/taglib/taglib/relativevolumeframe.h new file mode 120000 index 0000000000..98cbd6b46e --- /dev/null +++ b/libs/taglib/taglib/relativevolumeframe.h @@ -0,0 +1 @@ +./mpeg/id3v2/frames/relativevolumeframe.h
\ No newline at end of file diff --git a/libs/taglib/taglib/speexfile.h b/libs/taglib/taglib/speexfile.h new file mode 120000 index 0000000000..69b8223553 --- /dev/null +++ b/libs/taglib/taglib/speexfile.h @@ -0,0 +1 @@ +./ogg/speex/speexfile.h
\ No newline at end of file diff --git a/libs/taglib/taglib/speexproperties.h b/libs/taglib/taglib/speexproperties.h new file mode 120000 index 0000000000..28b883c1d2 --- /dev/null +++ b/libs/taglib/taglib/speexproperties.h @@ -0,0 +1 @@ +./ogg/speex/speexproperties.h
\ No newline at end of file diff --git a/libs/taglib/taglib/taglib.h b/libs/taglib/taglib/taglib.h new file mode 120000 index 0000000000..8a9f286ab9 --- /dev/null +++ b/libs/taglib/taglib/taglib.h @@ -0,0 +1 @@ +./toolkit/taglib.h
\ No newline at end of file diff --git a/libs/taglib/taglib/tbytevector.h b/libs/taglib/taglib/tbytevector.h new file mode 120000 index 0000000000..2aba448a9c --- /dev/null +++ b/libs/taglib/taglib/tbytevector.h @@ -0,0 +1 @@ +./toolkit/tbytevector.h
\ No newline at end of file diff --git a/libs/taglib/taglib/tbytevectorlist.h b/libs/taglib/taglib/tbytevectorlist.h new file mode 120000 index 0000000000..e2308fae3b --- /dev/null +++ b/libs/taglib/taglib/tbytevectorlist.h @@ -0,0 +1 @@ +./toolkit/tbytevectorlist.h
\ No newline at end of file diff --git a/libs/taglib/taglib/tdebug.h b/libs/taglib/taglib/tdebug.h new file mode 120000 index 0000000000..a27b5c3bc9 --- /dev/null +++ b/libs/taglib/taglib/tdebug.h @@ -0,0 +1 @@ +./toolkit/tdebug.h
\ No newline at end of file diff --git a/libs/taglib/taglib/textidentificationframe.h b/libs/taglib/taglib/textidentificationframe.h new file mode 120000 index 0000000000..4b775ee038 --- /dev/null +++ b/libs/taglib/taglib/textidentificationframe.h @@ -0,0 +1 @@ +./mpeg/id3v2/frames/textidentificationframe.h
\ No newline at end of file diff --git a/libs/taglib/taglib/tfile.h b/libs/taglib/taglib/tfile.h new file mode 120000 index 0000000000..09d3e52a3a --- /dev/null +++ b/libs/taglib/taglib/tfile.h @@ -0,0 +1 @@ +./toolkit/tfile.h
\ No newline at end of file diff --git a/libs/taglib/taglib/tlist.h b/libs/taglib/taglib/tlist.h new file mode 120000 index 0000000000..ce60095443 --- /dev/null +++ b/libs/taglib/taglib/tlist.h @@ -0,0 +1 @@ +./toolkit/tlist.h
\ No newline at end of file diff --git a/libs/taglib/taglib/tlist.tcc b/libs/taglib/taglib/tlist.tcc new file mode 120000 index 0000000000..03b9a96362 --- /dev/null +++ b/libs/taglib/taglib/tlist.tcc @@ -0,0 +1 @@ +toolkit/tlist.tcc
\ No newline at end of file diff --git a/libs/taglib/taglib/tmap.h b/libs/taglib/taglib/tmap.h new file mode 120000 index 0000000000..7a59378e13 --- /dev/null +++ b/libs/taglib/taglib/tmap.h @@ -0,0 +1 @@ +./toolkit/tmap.h
\ No newline at end of file diff --git a/libs/taglib/taglib/tmap.tcc b/libs/taglib/taglib/tmap.tcc new file mode 120000 index 0000000000..c9d4591d7d --- /dev/null +++ b/libs/taglib/taglib/tmap.tcc @@ -0,0 +1 @@ +toolkit/tmap.tcc
\ No newline at end of file diff --git a/libs/taglib/taglib/trueaudiofile.h b/libs/taglib/taglib/trueaudiofile.h new file mode 120000 index 0000000000..7a677f17fd --- /dev/null +++ b/libs/taglib/taglib/trueaudiofile.h @@ -0,0 +1 @@ +./trueaudio/trueaudiofile.h
\ No newline at end of file diff --git a/libs/taglib/taglib/trueaudioproperties.h b/libs/taglib/taglib/trueaudioproperties.h new file mode 120000 index 0000000000..5e7f7d6c37 --- /dev/null +++ b/libs/taglib/taglib/trueaudioproperties.h @@ -0,0 +1 @@ +./trueaudio/trueaudioproperties.h
\ No newline at end of file diff --git a/libs/taglib/taglib/tstring.h b/libs/taglib/taglib/tstring.h new file mode 120000 index 0000000000..acbe0c80be --- /dev/null +++ b/libs/taglib/taglib/tstring.h @@ -0,0 +1 @@ +./toolkit/tstring.h
\ No newline at end of file diff --git a/libs/taglib/taglib/tstringlist.h b/libs/taglib/taglib/tstringlist.h new file mode 120000 index 0000000000..918658c425 --- /dev/null +++ b/libs/taglib/taglib/tstringlist.h @@ -0,0 +1 @@ +./toolkit/tstringlist.h
\ No newline at end of file diff --git a/libs/taglib/taglib/unicode.h b/libs/taglib/taglib/unicode.h new file mode 120000 index 0000000000..30009297b5 --- /dev/null +++ b/libs/taglib/taglib/unicode.h @@ -0,0 +1 @@ +./toolkit/unicode.h
\ No newline at end of file diff --git a/libs/taglib/taglib/uniquefileidentifierframe.h b/libs/taglib/taglib/uniquefileidentifierframe.h new file mode 120000 index 0000000000..55b9305b66 --- /dev/null +++ b/libs/taglib/taglib/uniquefileidentifierframe.h @@ -0,0 +1 @@ +./mpeg/id3v2/frames/uniquefileidentifierframe.h
\ No newline at end of file diff --git a/libs/taglib/taglib/unknownframe.h b/libs/taglib/taglib/unknownframe.h new file mode 120000 index 0000000000..e46996ab13 --- /dev/null +++ b/libs/taglib/taglib/unknownframe.h @@ -0,0 +1 @@ +./mpeg/id3v2/frames/unknownframe.h
\ No newline at end of file diff --git a/libs/taglib/taglib/unsynchronizedlyricsframe.h b/libs/taglib/taglib/unsynchronizedlyricsframe.h new file mode 120000 index 0000000000..162a88d26f --- /dev/null +++ b/libs/taglib/taglib/unsynchronizedlyricsframe.h @@ -0,0 +1 @@ +./mpeg/id3v2/frames/unsynchronizedlyricsframe.h
\ No newline at end of file diff --git a/libs/taglib/taglib/urllinkframe.h b/libs/taglib/taglib/urllinkframe.h new file mode 120000 index 0000000000..1e1aa15219 --- /dev/null +++ b/libs/taglib/taglib/urllinkframe.h @@ -0,0 +1 @@ +./mpeg/id3v2/frames/urllinkframe.h
\ No newline at end of file diff --git a/libs/taglib/taglib/vorbisfile.h b/libs/taglib/taglib/vorbisfile.h new file mode 120000 index 0000000000..d5d372bf03 --- /dev/null +++ b/libs/taglib/taglib/vorbisfile.h @@ -0,0 +1 @@ +./ogg/vorbis/vorbisfile.h
\ No newline at end of file diff --git a/libs/taglib/taglib/vorbisproperties.h b/libs/taglib/taglib/vorbisproperties.h new file mode 120000 index 0000000000..e1d36a3f23 --- /dev/null +++ b/libs/taglib/taglib/vorbisproperties.h @@ -0,0 +1 @@ +./ogg/vorbis/vorbisproperties.h
\ No newline at end of file diff --git a/libs/taglib/taglib/wavpackfile.h b/libs/taglib/taglib/wavpackfile.h new file mode 120000 index 0000000000..c88dd7c45d --- /dev/null +++ b/libs/taglib/taglib/wavpackfile.h @@ -0,0 +1 @@ +./wavpack/wavpackfile.h
\ No newline at end of file diff --git a/libs/taglib/taglib/wavpackproperties.h b/libs/taglib/taglib/wavpackproperties.h new file mode 120000 index 0000000000..089b5b713e --- /dev/null +++ b/libs/taglib/taglib/wavpackproperties.h @@ -0,0 +1 @@ +./wavpack/wavpackproperties.h
\ No newline at end of file diff --git a/libs/taglib/taglib/xingheader.h b/libs/taglib/taglib/xingheader.h new file mode 120000 index 0000000000..a2711031ab --- /dev/null +++ b/libs/taglib/taglib/xingheader.h @@ -0,0 +1 @@ +./mpeg/xingheader.h
\ No newline at end of file diff --git a/libs/taglib/taglib/xiphcomment.h b/libs/taglib/taglib/xiphcomment.h new file mode 120000 index 0000000000..96e9483222 --- /dev/null +++ b/libs/taglib/taglib/xiphcomment.h @@ -0,0 +1 @@ +./ogg/xiphcomment.h
\ No newline at end of file |