*/
-#include <ardour/audiofile_tagger.h>
+#include "ardour/audiofile_tagger.h"
-#include <ardour/session_metadata.h>
+#include "ardour/session_metadata.h"
-#include <pbd/convert.h>
+#include "pbd/string_convert.h"
#include <taglib/fileref.h>
-#include <taglib/oggfile.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;
{
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());
+ if (file.isNull()) {
+ std::cerr << "TagLib::FileRef is null for file" << filename << std::endl;
+ return true; // continue anyway?!
+ }
+
+ if (!file.tag()) {
+ std::cerr << "TagLib::Tag is null for file" << filename << std::endl;
+ return true; // continue anyway?!
+ }
+
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;
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;
std::cerr << "Could not get Xiph comment for Ogg file!" << std::endl;
}
}
-
+
file.save();
return true;
}
tag.setGenre (TL_STR(metadata.genre()));
tag.setYear (metadata.year());
tag.setTrack (metadata.track_number());
-
+
return true;
}
tag.addField ("MIXER", TL_STR(metadata.mixer()));
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));
-
+ tag.addField ("DISCNUMBER", to_string (metadata.disc_number()));
+
// No field for total discs or tracks
return true;