mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-12-13 13:24:49 +00:00
Fixed: #1032 Crash in OpenAL driver when a music is playing and user returns to selection menu
This commit is contained in:
parent
52269e67d2
commit
21cd09beb5
1 changed files with 7 additions and 7 deletions
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue