Changeset 7225 in orxonox.OLD for trunk/src/lib/sound

Timestamp:

Mar 18, 2006, 12:04:39 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: more std::string

Location:

trunk/src/lib/sound

Files:

• sound_engine.cc (modified) (2 diffs)
• sound_engine.h (modified) (1 diff)

trunk/src/lib/sound/sound_engine.cc

@@ -352 +352 @@
 }
 
-bool SoundEngine::checkError(const char* error, unsigned int line)
+bool SoundEngine::checkError(const std::string& error, unsigned int line)
 {
   ALenum errorCode;
   if ((errorCode = alGetError()) != AL_NO_ERROR)
   {
-    PRINTF(1)("Error %s (line:%d): '%s'\n", error, line, SoundEngine::getALErrorString(errorCode));
+    PRINTF(1)("Error %s (line:%d): '%s'\n", error.c_str(), line, SoundEngine::getALErrorString(errorCode));
     return false;
   }
@@ -364 +364 @@
 }
 
-bool SoundEngine::checkALCError(const char* error, unsigned int line)
+bool SoundEngine::checkALCError(const std::string& error, unsigned int line)
 {
   ALenum errorCode;
   if ((errorCode = alcGetError(this->device)) != ALC_NO_ERROR)
   {
-    PRINTF(1)("Error %s (line:%d): '%s'\n", error, line, SoundEngine::getALCErrorString(errorCode));
+    PRINTF(1)("Error %s (line:%d): '%s'\n", error.c_str(), line, SoundEngine::getALCErrorString(errorCode));
     return false;
   }

trunk/src/lib/sound/sound_engine.h

@@ -59 +59 @@
 
   // error handling:
-    static bool checkError(const char* error, unsigned int line);
-    bool checkALCError(const char* error, unsigned int line);
+    static bool checkError(const std::string& error, unsigned int line);
+    bool checkALCError(const std::string& error, unsigned int line);
     static const char* getALErrorString(ALenum err);
     static const char* getALCErrorString(ALenum err);