diff --git a/WickedEngine/wiSound.cpp b/WickedEngine/wiSound.cpp index a3bdc35a5..5dcee5df5 100644 --- a/WickedEngine/wiSound.cpp +++ b/WickedEngine/wiSound.cpp @@ -135,7 +135,7 @@ HRESULT wiSound::ReadChunkData(HANDLE hFile, void * buffer, DWORD buffersize, DW hr = HRESULT_FROM_WIN32( GetLastError() ); return hr; } -HRESULT wiSound::OpenFile(TCHAR* strFileName) +HRESULT wiSound::OpenFile(const TCHAR* strFileName) { HRESULT hr; @@ -195,11 +195,11 @@ HRESULT wiSound::OpenFile(TCHAR* strFileName) } HRESULT wiSound::Load(wstring filename) { - return OpenFile(filename._Myptr()); + return OpenFile(filename.data()); } HRESULT wiSound::Load(string filename) { - return OpenFile(wstring(filename.begin(),filename.end())._Myptr()); + return OpenFile(wstring(filename.begin(),filename.end()).data()); } void wiSound::Stop(){ StopSound(); diff --git a/WickedEngine/wiSound.h b/WickedEngine/wiSound.h index 2876d2198..6a9bcd2ab 100644 --- a/WickedEngine/wiSound.h +++ b/WickedEngine/wiSound.h @@ -53,7 +53,7 @@ protected: HRESULT FindChunk(HANDLE hFile, DWORD fourcc, DWORD & dwChunkSize, DWORD & dwChunkDataPosition); HRESULT ReadChunkData(HANDLE hFile, void * buffer, DWORD buffersize, DWORD bufferoffset); - HRESULT OpenFile(TCHAR*); + HRESULT OpenFile(const TCHAR*); HRESULT PlaySound(wiAudioEngine* engine); void StopSound();