mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2024-10-02 04:52:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added special MP4 tag parsing to TaglibMetadataReader

Browse Source
This commit is contained in:
casey langen 2017-07-30 19:51:13 -07:00
parent 30a0b244cd
commit 7583f629bd
2 changed files with 43 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/plugins/taglib_plugin/TaglibMetadataReader.cpp
View File

@ -189,20 +189,34 @@ bool TaglibMetadataReader::ReadGeneric(const char* uri, musik::core::sdk::ITrack
this->ReadFromMap(tag->properties(), target); this->ReadFromMap(tag->properties(), target);
/* taglib hides certain properties (like album artist) in the XiphComment's /* taglib hides certain properties (like album artist) in the XiphComment's
field list. see if we're dealing with a FLAC file with a Xiph comment. if so, field list. if we're dealing with a straight-up Xiph tag, process it now */
extract those as well. */
auto xiphTag = dynamic_cast<TagLib::Ogg::XiphComment*>(tag); auto xiphTag = dynamic_cast<TagLib::Ogg::XiphComment*>(tag);
if (xiphTag) { if (xiphTag) {
this->ReadFromMap(xiphTag->fieldListMap(), target); this->ReadFromMap(xiphTag->fieldListMap(), target);
} }
/* flac files may have more than one type of tag embedded. see if there's /* if this isn't a xiph tag, the file format may have some other custom
see if there's a xiph comment burried deep. */ properties. let's see if we can pull them out here... */
if (!xiphTag) { if (!xiphTag) {
bool handled = false;
/* flac files may have more than one type of tag embedded. see if there's
see if there's a xiph comment burried deep. */
auto flacFile = dynamic_cast<TagLib::FLAC::File*>(file.file()); auto flacFile = dynamic_cast<TagLib::FLAC::File*>(file.file());
if (flacFile) { if (flacFile && flacFile->hasXiphComment()) {
if (flacFile->hasXiphComment()) { this->ReadFromMap(flacFile->xiphComment()->fieldListMap(), target);
this->ReadFromMap(flacFile->xiphComment()->fieldListMap(), target); handled = true;
}
/* similarly, mp4 buries disc number and album artist. however, taglib does
NOT exposed a map with normalized keys, so we have to do special property
handling here... */
if (!handled) {
auto mp4File = dynamic_cast<TagLib::MP4::File*>(file.file());
if (mp4File && mp4File->hasMP4Tag()) {
auto mp4TagMap = static_cast<TagLib::MP4::Tag*>(tag)->itemListMap();
this->ExtractValueForKey(mp4TagMap, "aART", "album_artist", target);
this->ExtractValueForKey(mp4TagMap, "disk", "disc", target);
} }
} }
} }
@ -217,6 +231,20 @@ bool TaglibMetadataReader::ReadGeneric(const char* uri, musik::core::sdk::ITrack
return false; return false;
} }
void TaglibMetadataReader::ExtractValueForKey(
const TagLib::MP4::ItemMap& map,
const std::string& inputKey,
const std::string& outputKey,
musik::core::sdk::ITrackWriter *target)
{
if (map.contains(inputKey.c_str())) {
TagLib::StringList value = map[inputKey.c_str()].toStringList();
if (value.size()) {
this->SetTagValue(outputKey.c_str(), value[0], target);
}
}
}
template <typename T> template <typename T>
void TaglibMetadataReader::ExtractValueForKey( void TaglibMetadataReader::ExtractValueForKey(
const T& map, const T& map,

8
src/plugins/taglib_plugin/TaglibMetadataReader.h
View File

@ -43,6 +43,7 @@
#include <taglib/fileref.h> #include <taglib/fileref.h>
#include <taglib/audioproperties.h> #include <taglib/audioproperties.h>
#include <taglib/mpeg/id3v2/id3v2tag.h> #include <taglib/mpeg/id3v2/id3v2tag.h>
#include <taglib/mp4/mp4file.h>
#else #else
#include <taglib/tlist.h> #include <taglib/tlist.h>
#include <taglib/tfile.h> #include <taglib/tfile.h>
@ -50,6 +51,7 @@
#include <taglib/fileref.h> #include <taglib/fileref.h>
#include <taglib/audioproperties.h> #include <taglib/audioproperties.h>
#include <taglib/id3v2tag.h> #include <taglib/id3v2tag.h>
#include <taglib/mp4file.h>
#endif #endif
#include <set> #include <set>
@ -74,6 +76,12 @@ class TaglibMetadataReader : public musik::core::sdk::IMetadataReader {
const std::string& outputKey, const std::string& outputKey,
musik::core::sdk::ITrackWriter *target); musik::core::sdk::ITrackWriter *target);
void ExtractValueForKey(
const TagLib::MP4::ItemMap& map,
const std::string& inputKey,
const std::string& outputKey,
musik::core::sdk::ITrackWriter *target);
void SetTagValue( void SetTagValue(
const char* key, const char* key,
const char* string,musik::core::sdk::ITrackWriter *target); const char* string,musik::core::sdk::ITrackWriter *target);