mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2025-04-16 23:42:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Win32 file-exclusivity fix.

Browse Source
This commit is contained in:
casey langen 2019-02-01 11:57:36 -08:00
parent 567c7a698c
commit 2023e43c62
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,11 +136,11 @@ static inline std::wstring utf8to16(const char* utf8) {
static TagLib::FileRef resolveOggType(const char* uri) { static TagLib::FileRef resolveOggType(const char* uri) {
try { try {
#ifdef WIN32 #ifdef WIN32
FILE* file = _wfopen(utf8to16(uri).c_str(), L"rb"); FILE* file = _wfopen(utf8to16(uri).c_str(), L"rb");
#else #else
FILE* file = fopen(uri, "rb"); FILE* file = fopen(uri, "rb");
#endif #endif
if (file) { if (file) {
static const char OGG_OPUS_HEADER[8] = {'O','p','u','s','H','e','a','d'}; static const char OGG_OPUS_HEADER[8] = {'O','p','u','s','H','e','a','d'};
@ -154,9 +154,15 @@ static TagLib::FileRef resolveOggType(const char* uri) {
std::begin(OGG_OPUS_HEADER), std::end(OGG_OPUS_HEADER)); std::begin(OGG_OPUS_HEADER), std::end(OGG_OPUS_HEADER));
if (it != std::end(buffer)) { if (it != std::end(buffer)) {
#ifdef WIN32
const std::wstring uri16 = utf8to16(uri);
return TagLib::FileRef(new TagLib::Ogg::Opus::File(uri16.c_str()));
#else
return TagLib::FileRef(new TagLib::Ogg::Opus::File(uri)); return TagLib::FileRef(new TagLib::Ogg::Opus::File(uri));
#endif
} }
} }
} }
} }
catch (...) { catch (...) {
@ -277,6 +283,7 @@ bool TaglibMetadataReader::ReadGeneric(
assumes it's a vorbis file. in this case, we'll read the header assumes it's a vorbis file. in this case, we'll read the header
and try to guess the filetype */ and try to guess the filetype */
if (file.isNull() && extension == "ogg") { if (file.isNull() && extension == "ogg") {
file = TagLib::FileRef(); /* closes the file */
file = resolveOggType(uri); file = resolveOggType(uri);
} }