diff options
| author | David Robillard <d@drobilla.net> | 2009-02-26 03:24:05 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2009-02-26 03:24:05 +0000 |
| commit | 906567d86794c10e92c34c40973a5d6a9eb733bb (patch) | |
| tree | 476dc3e93cc1372763b189b4fb4f4de239550456 /libs/ardour | |
| parent | b80aa1fa9d44be973eccf766718e38d9759ee39e (diff) | |
Use actually normal taglib headers (apparently it completely changes them on install. More idiotically layed out library tree, ever.).
Add symlinks to taglib source tree to mimick installed tree to avoid the copy thing.
git-svn-id: svn://localhost/ardour2/branches/3.0@4674 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour')
| -rw-r--r-- | libs/ardour/ardour/audiofile_tagger.h | 4 | ||||
| -rw-r--r-- | libs/ardour/audiofile_tagger.cc | 8 |
2 files changed, 6 insertions, 6 deletions
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) |