mirror of
https://github.com/clementine-player/Clementine
synced 2025-01-24 00:11:43 +01:00
Merge branch 'master' of https://code.google.com/p/clementine-player
This commit is contained in:
commit
8251b53411
@ -824,7 +824,7 @@ bool TagReader::ReadCloudFile(const QUrl& download_url,
|
|||||||
}
|
}
|
||||||
#ifdef TAGLIB_HAS_OPUS
|
#ifdef TAGLIB_HAS_OPUS
|
||||||
else if (mime_type == "application/opus" ||
|
else if (mime_type == "application/opus" ||
|
||||||
mime_type == "audio/opus") {
|
mime_type == "audio/opus") {
|
||||||
tag.reset(new TagLib::Ogg::Opus::File(
|
tag.reset(new TagLib::Ogg::Opus::File(
|
||||||
stream,
|
stream,
|
||||||
true,
|
true,
|
||||||
@ -832,7 +832,8 @@ bool TagReader::ReadCloudFile(const QUrl& download_url,
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
else if (mime_type == "application/x-flac" ||
|
else if (mime_type == "application/x-flac" ||
|
||||||
mime_type == "audio/flac") {
|
mime_type == "audio/flac" ||
|
||||||
|
mime_type == "audio/x-flac") {
|
||||||
tag.reset(new TagLib::FLAC::File(
|
tag.reset(new TagLib::FLAC::File(
|
||||||
stream,
|
stream,
|
||||||
TagLib::ID3v2::FrameFactory::instance(),
|
TagLib::ID3v2::FrameFactory::instance(),
|
||||||
|
@ -177,6 +177,7 @@ bool CloudFileService::IsSupportedMimeType(const QString& mime_type) const {
|
|||||||
mime_type == "audio/mpeg" ||
|
mime_type == "audio/mpeg" ||
|
||||||
mime_type == "audio/mp4" ||
|
mime_type == "audio/mp4" ||
|
||||||
mime_type == "audio/flac" ||
|
mime_type == "audio/flac" ||
|
||||||
|
mime_type == "audio/x-flac" ||
|
||||||
mime_type == "application/ogg" ||
|
mime_type == "application/ogg" ||
|
||||||
mime_type == "application/x-flac" ||
|
mime_type == "application/x-flac" ||
|
||||||
mime_type == "audio/x-ms-wma";
|
mime_type == "audio/x-ms-wma";
|
||||||
|
Loading…
Reference in New Issue
Block a user