From d224d4a30fc0772c1de5adb175ec5e7205964db3 Mon Sep 17 00:00:00 2001
From: Erik Hofman <erik@ehofman.com>
Date: Wed, 3 Aug 2016 10:52:40 +0200
Subject: [PATCH] Reflect the latest header changes
---
simgear/sound/aeonwave_test1.cxx | 4 ++--
simgear/sound/soundmgr_aeonwave.cxx | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/simgear/sound/aeonwave_test1.cxx b/simgear/sound/aeonwave_test1.cxx
index 18642103..46fb4c47 100644
--- a/simgear/sound/aeonwave_test1.cxx
+++ b/simgear/sound/aeonwave_test1.cxx
@@ -15,10 +15,10 @@
bool testForError(aax::AeonWave& p, std::string s)
{
- enum aaxErrorType error = aax::error_no();
+ enum aaxErrorType error = p.error_no();
if (error != AAX_ERROR_NONE) {
std::cout << "AeonWave Error: "
- << aax::error(error) << " at " << s << std::endl;
+ << aax::strerror(error) << " at " << s << std::endl;
return true;
}
return false;
diff --git a/simgear/sound/soundmgr_aeonwave.cxx b/simgear/sound/soundmgr_aeonwave.cxx
index 737d1026..f8618e25 100644
--- a/simgear/sound/soundmgr_aeonwave.cxx
+++ b/simgear/sound/soundmgr_aeonwave.cxx
@@ -61,7 +61,7 @@ typedef sample_group_map::iterator sample_group_map_iterator;
typedef sample_group_map::const_iterator const_sample_group_map_iterator;
#if 1
-# define TRY(a) if ((a) == 0) printf("%i: %s\n", __LINE__, aax::error())
+# define TRY(a) if ((a) == 0) printf("%i: %s\n", __LINE__, d->_aax.strerror())
#else
# define TRY(a) (a)
#endif
@@ -702,7 +702,7 @@ bool SGSoundMgr::testForError(std::string s, std::string name)
enum aaxErrorType error = aax::error_no();
if (error != AAX_ERROR_NONE) {
SG_LOG( SG_SOUND, SG_ALERT, "AeonWave Error (" << name << "): "
- << aax::error(error) << " at " << s);
+ << aax::strerror(error) << " at " << s);
return true;
}
#endif
--
2.39.5