BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Do a dumb-ass static string copy for const-incorrect old versions of ov_fopen

Browse Source
This commit is contained in:
Perttu Ahola 2012-03-27 00:06:26 +03:00
parent d01387a82f
commit cbe11fc7aa
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/sound_openal.cpp
View File

@ -116,9 +116,14 @@ SoundBuffer* loadOggFile(const std::string &filepath)
char array[BUFFER_SIZE]; // Local fixed size array char array[BUFFER_SIZE]; // Local fixed size array
vorbis_info *pInfo; vorbis_info *pInfo;
OggVorbis_File oggFile; OggVorbis_File oggFile;
// Do a dumb-ass static string copy for old versions of ov_fopen
// because they expect a non-const char*
char nonconst[10000];
snprintf(nonconst, 10000, "%s", filepath.c_str());
// Try opening the given file // Try opening the given file
if(ov_fopen(filepath.c_str(), &oggFile) != 0) //if(ov_fopen(filepath.c_str(), &oggFile) != 0)
if(ov_fopen(nonconst, &oggFile) != 0)
{ {
infostream<<"Audio: Error opening "<<filepath<<" for decoding"<<std::endl; infostream<<"Audio: Error opening "<<filepath<<" for decoding"<<std::endl;
return NULL; return NULL;