X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudiofile_tagger.cc;h=61a05d49ced7d57aa5e3e32e59215e389f483063;hb=70308f51747b5beeff99dec9f10490080f00b0c2;hp=cfd839fc0cfcf948596f9798c65b72d81984f8d6;hpb=906567d86794c10e92c34c40973a5d6a9eb733bb;p=ardour.git

diff --git a/libs/ardour/audiofile_tagger.cc b/libs/ardour/audiofile_tagger.cc
index cfd839fc0c..61a05d49ce 100644
--- a/libs/ardour/audiofile_tagger.cc
+++ b/libs/ardour/audiofile_tagger.cc
@@ -24,15 +24,15 @@
 
 #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 Glib::ustring to TagLib::String */
-#define TL_STR(ustring) TagLib::String ((ustring).c_str(), TagLib::String::UTF8)
+/* Convert string to TagLib::String */
+#define TL_STR(string) TagLib::String ((string).c_str(), TagLib::String::UTF8)
 
 using namespace PBD;
 
@@ -40,15 +40,15 @@ 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());
-	
+
 	tag_generic (tag, metadata);
-	
+
 	/* FLAC */
-	
+
 	TagLib::FLAC::File * flac_file;
 	if ((flac_file = dynamic_cast<TagLib::FLAC::File *> (file.file()))) {
 		TagLib::Ogg::XiphComment * vorbis_tag;
@@ -58,9 +58,9 @@ AudiofileTagger::tag_file (string const & filename, SessionMetadata const & meta
 			std::cerr << "Could not get Xiph comment for FLAC file!" << std::endl;
 		}
 	}
-	
+
 	/* Ogg */
-	
+
 	TagLib::Ogg::File * ogg_file;
 	if ((ogg_file = dynamic_cast<TagLib::Ogg::File *> (file.file()))) {
 		TagLib::Ogg::XiphComment * vorbis_tag;
@@ -70,7 +70,7 @@ AudiofileTagger::tag_file (string const & filename, SessionMetadata const & meta
 			std::cerr << "Could not get Xiph comment for Ogg file!" << std::endl;
 		}
 	}
-	
+
 	file.save();
 	return true;
 }
@@ -85,7 +85,7 @@ AudiofileTagger::tag_generic (TagLib::Tag & tag, SessionMetadata const & metadat
 	tag.setGenre (TL_STR(metadata.genre()));
 	tag.setYear (metadata.year());
 	tag.setTrack (metadata.track_number());
-	
+
 	return true;
 }
 
@@ -109,7 +109,7 @@ AudiofileTagger::tag_vorbis_comment (TagLib::Ogg::XiphComment & tag, SessionMeta
 	tag.addField ("COMPILATION", TL_STR(metadata.compilation()));
 	tag.addField ("DISCSUBTITLE", TL_STR(metadata.disc_subtitle()));
 	tag.addField ("DISCNUMBER", to_string (metadata.disc_number(), std::dec));
-	
+
 	// No field for total discs or tracks
 
 	return true;