FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make a failed wav file a SG_POPUP message

Browse Source
This commit is contained in:
Erik Hofman
2016-07-20 15:02:24 +02:00
parent 3092274cac
commit d902fffa46
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/sound/readwav.cxx
+1 -1
View File
@@ -394,7 +394,7 @@ ALvoid* loadWAVFromFile(const SGPath& path, unsigned int& format, ALsizei& size,
try { try {
loadWavFile(fd, &b); loadWavFile(fd, &b);
} catch (sg_exception& e) { } catch (sg_exception& e) {
throw sg_io_exception(e.getFormattedMessage() + " for " + path.str()); throw sg_io_exception(e.getFormattedMessage() + "\nfor: " + path.str());
} }
ALvoid* data = b.data; ALvoid* data = b.data;
simgear/sound/soundmgr_openal.cxx
+2 -2
View File
@@ -556,8 +556,8 @@ unsigned int SGSoundMgr::request_buffer(SGSoundSample *sample)
bool res = load(sample_name, &sample_data, &format, &size, &freq, &block); bool res = load(sample_name, &sample_data, &format, &size, &freq, &block);
if (res == false) return NO_BUFFER; if (res == false) return NO_BUFFER;
} catch (sg_exception& e) { } catch (sg_exception& e) {
SG_LOG(SG_SOUND, SG_ALERT, SG_LOG(SG_SOUND, SG_POPUP,
"failed to load sound buffer: " << e.getFormattedMessage()); "failed to load sound buffer:\n" << e.getFormattedMessage());
sample->set_buffer( SGSoundMgr::FAILED_BUFFER ); sample->set_buffer( SGSoundMgr::FAILED_BUFFER );
return FAILED_BUFFER; return FAILED_BUFFER;
} }