Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Fixed ogg filepath has unicode in Win32" 

This reverts commit 382fd48b6a.
This commit is contained in:
cpascal 2015-05-13 20:49:46 +09:00
parent 14f8b02d9b
commit 7e9019f9d6
1 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cocos/audio/win32/AudioCache.cpp
View File

@ -34,7 +34,6 @@
#include "vorbis/codec.h" #include "vorbis/codec.h"
#include "vorbis/vorbisfile.h" #include "vorbis/vorbisfile.h"
#include "base/ccUtils.h" #include "base/ccUtils.h"
#include "base/ccUTF8.h"
#define PCMDATA_CACHEMAXSIZE 2621440 #define PCMDATA_CACHEMAXSIZE 2621440
@ -85,25 +84,6 @@ AudioCache::~AudioCache()
} }
} }
static bool UTF8ToANSI(const std::string& utf8Text, std::string& outANSIText)
{
std::u16string utf16Text;
if (cocos2d::StringUtils::UTF8ToUTF16(utf8Text, utf16Text) == false)
{
return false;
}
int requiredSize = ::WideCharToMultiByte(CP_ACP, 0, (LPCWSTR) utf16Text.c_str(), -1, 0, 0, 0, 0);
if(requiredSize > 0)
{
std::vector<char> buffer(requiredSize);
::WideCharToMultiByte(CP_ACP, 0, (LPCWSTR) utf16Text.c_str(), -1, &buffer[0], requiredSize, 0, 0);
outANSIText.assign(buffer.begin(), buffer.end() - 1);
}
return true;
}
void AudioCache::readDataTask() void AudioCache::readDataTask()
{ {
_readDataTaskMutex.lock(); _readDataTaskMutex.lock();
@ -117,11 +97,9 @@ void AudioCache::readDataTask()
case FileFormat::OGG: case FileFormat::OGG:
{ {
vf = new OggVorbis_File; vf = new OggVorbis_File;
std::string ansiFullPath; int openCode;
UTF8ToANSI(_fileFullPath, ansiFullPath); if (openCode = ov_fopen(FileUtils::getInstance()->getSuitableFOpen(_fileFullPath).c_str(), vf)){
if (ov_fopen(ansiFullPath.c_str(), vf)) log("Input does not appear to be an Ogg bitstream: %s. Code: 0x%x\n", _fileFullPath.c_str(), openCode);
{
log("Input does not appear to be an Ogg bitstream.\n");
goto ExitThread; goto ExitThread;
} }