From 2732c64c07f20aaafcee0e9264f7d5279fbd5708 Mon Sep 17 00:00:00 2001 From: ben Date: Tue, 6 Aug 2013 08:50:26 -0500 Subject: [PATCH] fix taglib header paths so linked headers are not necessary --- libs/ardour/ardour/audiofile_tagger.h | 4 ++-- libs/ardour/audiofile_tagger.cc | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/ardour/ardour/audiofile_tagger.h b/libs/ardour/ardour/audiofile_tagger.h index 0519e2233c..9a46e235d8 100644 --- a/libs/ardour/ardour/audiofile_tagger.h +++ b/libs/ardour/ardour/audiofile_tagger.h @@ -24,8 +24,8 @@ #include #include "taglib/tag.h" -#include "taglib/taglib.h" -#include "taglib/xiphcomment.h" +#include "taglib/toolkit/taglib.h" +#include "taglib/ogg/xiphcomment.h" namespace ARDOUR { diff --git a/libs/ardour/audiofile_tagger.cc b/libs/ardour/audiofile_tagger.cc index 57650860ee..d27b9c97af 100644 --- a/libs/ardour/audiofile_tagger.cc +++ b/libs/ardour/audiofile_tagger.cc @@ -24,12 +24,12 @@ #include "pbd/convert.h" -#include "taglib/fileref.h" -#include "taglib/flacfile.h" -#include "taglib/oggfile.h" +#include "taglib/taglib/fileref.h" +#include "taglib/flac/flacfile.h" +#include "taglib/ogg/oggfile.h" #include "taglib/tag.h" -#include "taglib/taglib.h" -#include "taglib/xiphcomment.h" +#include "taglib/toolkit/taglib.h" +#include "taglib/ogg/xiphcomment.h" /* Convert string to TagLib::String */ #define TL_STR(string) TagLib::String ((string).c_str(), TagLib::String::UTF8)