13
0

Merge branch 'windows' of git.ardour.org:ardour/ardour into windows

This commit is contained in:
John Emmas 2013-08-06 15:18:27 +01:00
commit 7169c77cfc
2 changed files with 7 additions and 7 deletions

View File

@ -24,8 +24,8 @@
#include <string> #include <string>
#include "taglib/tag.h" #include "taglib/tag.h"
#include "taglib/taglib.h" #include "taglib/toolkit/taglib.h"
#include "taglib/xiphcomment.h" #include "taglib/ogg/xiphcomment.h"
namespace ARDOUR namespace ARDOUR
{ {

View File

@ -24,12 +24,12 @@
#include "pbd/convert.h" #include "pbd/convert.h"
#include "taglib/fileref.h" #include "taglib/taglib/fileref.h"
#include "taglib/flacfile.h" #include "taglib/flac/flacfile.h"
#include "taglib/oggfile.h" #include "taglib/ogg/oggfile.h"
#include "taglib/tag.h" #include "taglib/tag.h"
#include "taglib/taglib.h" #include "taglib/toolkit/taglib.h"
#include "taglib/xiphcomment.h" #include "taglib/ogg/xiphcomment.h"
/* Convert string to TagLib::String */ /* Convert string to TagLib::String */
#define TL_STR(string) TagLib::String ((string).c_str(), TagLib::String::UTF8) #define TL_STR(string) TagLib::String ((string).c_str(), TagLib::String::UTF8)