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

Added support for opus, wavepack and wma when the ffmpeg decoder is

Browse Source 
enabled.
This commit is contained in:
casey langen 2018-12-25 15:41:08 -08:00
parent b53aa33ae4
commit 81888780b4
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/ffmpegdecoder/plugin.cpp
View File

@ -105,6 +105,7 @@ class FfmpegDecoderFactory : public musik::core::sdk::IDecoderFactory {
{ "audio/monkeys-audio", AV_CODEC_ID_APE },
{ ".wma", AV_CODEC_ID_WMAV2 },
{ "audio/x-ms-wma", AV_CODEC_ID_WMAV2 },
{ ".wv", AV_CODEC_ID_WAVPACK },
};
AVCodec* codec = av_codec_next(nullptr);

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

@ -54,6 +54,7 @@
#include <taglib/ogg/xiphcomment.h>
#include <taglib/flac/flacfile.h>
#include <taglib/toolkit/tpropertymap.h>
#include <taglib/wavpack/wavpackfile.h>
#else
#include <taglib/tlist.h>
#include <taglib/tfile.h>
@ -71,6 +72,7 @@
#include <taglib/mp4file.h>
#include <taglib/oggfile.h>
#include <taglib/flacfile.h>
#include <taglib/wavpackfile.h>
#include <taglib/xiphcomment.h>
#include <taglib/tpropertymap.h>
#include <taglib/textidentificationframe.h>
@ -141,19 +143,23 @@ void TaglibMetadataReader::Release() {
delete this;
}
bool TaglibMetadataReader::CanRead(const char *extension){
bool TaglibMetadataReader::CanRead(const char *extension) {
if (extension) {
std::string ext(extension);
boost::algorithm::to_lower(ext);
return
#if FFMPEG_DECODER
ext.compare("opus") == 0 ||
ext.compare("wv") == 0 ||
ext.compare("wma") == 0 ||
ext.compare("ape") == 0 ||
ext.compare("mpc") == 0 ||
ext.compare("aac") == 0 ||
#endif
ext.compare("mp3") == 0 ||
ext.compare("ogg") == 0 ||
ext.compare("aac") == 0 ||
ext.compare("m4a") == 0 ||
ext.compare("flac") == 0 ||
ext.compare("ape") == 0 ||
ext.compare("mpc") == 0;
ext.compare("flac") == 0;
}
return false;
@ -259,6 +265,16 @@ bool TaglibMetadataReader::ReadGeneric(const char* uri, ITagStore *target) {
this->ExtractValueForKey(mp4TagMap, "aART", "album_artist", target);
this->ExtractValueForKey(mp4TagMap, "disk", "disc", target);
this->ExtractReplayGain(mp4TagMap, target);
handled = true;
}
}
if (!handled) {
auto wvFile = dynamic_cast<TagLib::WavPack::File*>(file.file());
if (wvFile && wvFile->hasAPETag()) {
this->ReadFromMap(wvFile->properties(), target);
this->ExtractReplayGain(wvFile->properties(), target);
handled = true;
}
}
}