diff options
| author | John Emmas <johne53@tiscali.co.uk> | 2013-08-06 15:18:27 +0100 |
|---|---|---|
| committer | John Emmas <johne53@tiscali.co.uk> | 2013-08-06 15:18:27 +0100 |
| commit | 7169c77cfc5a45ec29dcb58a251feccba5ac6b62 (patch) | |
| tree | 41273a75464ba2305305f1db9c8ee21d0032edb3 /libs | |
| parent | 0dc8806ee473f96d1f480f7a50b7a39efaf6d90a (diff) | |
| parent | 2732c64c07f20aaafcee0e9264f7d5279fbd5708 (diff) | |
Merge branch 'windows' of git.ardour.org:ardour/ardour into windows
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/ardour/audiofile_tagger.h | 4 | ||||
| -rw-r--r-- | 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 <string> #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) |