Make a failed wav file a SG_POPUP message

diff --git a/simgear/sound/readwav.cxx b/simgear/sound/readwav.cxx
index fa892d23e004c6c08d24a612783e633ce98e8961..16df381fb5577ab7d21269b85b3b3a6e0e7d1137 100644 (file)
--- a/simgear/sound/readwav.cxx
+++ b/simgear/sound/readwav.cxx
@@ -394,7 +394,7 @@ ALvoid* loadWAVFromFile(const SGPath& path, unsigned int& format, ALsizei& size,
   try {
       loadWavFile(fd, &b);
   } 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;

diff --git a/simgear/sound/soundmgr_openal.cxx b/simgear/sound/soundmgr_openal.cxx
index ec1646af9242452ab5ec39b8abf9a6020ef87a55..c0dc25f6f16190c11bc0e8b5123cf363ce671aba 100644 (file)
--- a/simgear/sound/soundmgr_openal.cxx
+++ b/simgear/sound/soundmgr_openal.cxx
@@ -556,8 +556,8 @@ unsigned int SGSoundMgr::request_buffer(SGSoundSample *sample)
               bool res = load(sample_name, &sample_data, &format, &size, &freq, &block);
               if (res == false) return NO_BUFFER;
             } catch (sg_exception& e) {
-              SG_LOG(SG_SOUND, SG_ALERT,
-                    "failed to load sound buffer: " << e.getFormattedMessage());
+              SG_LOG(SG_SOUND, SG_POPUP,
+                    "failed to load sound buffer:\n" << e.getFormattedMessage());
               sample->set_buffer( SGSoundMgr::FAILED_BUFFER );
               return FAILED_BUFFER;
             }