From 0c5d50299bc20e16560b95901a772b80bb5d0091 Mon Sep 17 00:00:00 2001 From: kervala Date: Thu, 29 Jul 2010 13:44:55 +0200 Subject: [PATCH] Fixed: #1032 Crash in OpenAL driver when a music is playing and user returns to selection menu --- code/nel/src/sound/driver/music_buffer.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/code/nel/src/sound/driver/music_buffer.cpp b/code/nel/src/sound/driver/music_buffer.cpp index bf38be0f5..40088d49e 100644 --- a/code/nel/src/sound/driver/music_buffer.cpp +++ b/code/nel/src/sound/driver/music_buffer.cpp @@ -22,7 +22,8 @@ using namespace std; using namespace NLMISC; -namespace NLSOUND { +namespace NLSOUND +{ IMusicBuffer::IMusicBuffer() : _InternalStream(NULL) { @@ -45,8 +46,7 @@ IMusicBuffer *IMusicBuffer::createMusicBuffer(const std::string &filepath, bool string type = CFile::getExtension(filepath); CIFile *ifile = new CIFile(); - ifile->setCacheFileOnOpen(!async); - ifile->allowBNPCacheFileOnOpen(!async); + ifile->setAsyncLoading(async); ifile->open(lookup); IMusicBuffer *mb = createMusicBuffer(type, ifile, loop); @@ -80,17 +80,17 @@ bool IMusicBuffer::getInfo(const std::string &filepath, std::string &artist, std { string lookup = CPath::lookup(filepath, false); if (lookup.empty()) - { + { nlwarning("Music file %s does not exist!", filepath.c_str()); - return false; + return false; } string type = CFile::getExtension(filepath); string type_lower = toLower(type); if (type_lower == "ogg") { - CIFile ifile; - ifile.setCacheFileOnOpen(false); + CIFile ifile; + ifile.setCacheFileOnOpen(false); ifile.allowBNPCacheFileOnOpen(false); ifile.open(lookup); return CMusicBufferVorbis::getInfo(&ifile, artist, title);