Merge branch 'windows+cc' into cairocanvas

[ardour.git] / libs / ardour / audiofile_tagger.cc

diff --git a/libs/ardour/audiofile_tagger.cc b/libs/ardour/audiofile_tagger.cc
index 81ccf7a35ed92cc09130efd67df8b809a9e305ac..61a05d49ced7d57aa5e3e32e59215e389f483063 100644 (file)
--- 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/tag.h"
-#include "taglib/taglib.h"
-#include "taglib/xiphcomment.h"
+#include <taglib/fileref.h>
+#include <taglib/flacfile.h>
+#include <taglib/oggfile.h>
+#include <taglib/tag.h>
+#include <taglib/taglib.h>
+#include <taglib/xiphcomment.h>
 
 /* Convert string to TagLib::String */
 #define TL_STR(string) TagLib::String ((string).c_str(), TagLib::String::UTF8)
@@ -40,7 +40,7 @@ namespace ARDOUR
 {
 
 bool
-AudiofileTagger::tag_file (string const & filename, SessionMetadata const & metadata)
+AudiofileTagger::tag_file (std::string const & filename, SessionMetadata const & metadata)
 {
        TagLib::FileRef file (filename.c_str());
        TagLib::Tag & tag (*file.tag());