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

Timestamp:

Jan 30, 2006, 2:57:55 AM (19 years ago)

Author:

bensch

Message:

trunk: alc-stuff

Location:

trunk/src/lib/sound

Files:

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

trunk/src/lib/sound/sound_engine.cc

@@ -311 +311 @@
     alcMakeContextCurrent(this->context);
   #else*/
-  printf("!!!!!!!!!!!!!!!!!!%d\n", __LINE__);
   this->device = alcOpenDevice(NULL);
-  printf("!!!!!!!!!!!!!!!!!!%d\n", __LINE__);
-  SoundEngine::checkError("Error opening Device", __LINE__);
-  printf("!!!!!!!!!!!!!!!!!!%d\n", __LINE__);
+  this->checkError("Error opening Device", __LINE__);
+
   this->context = alcCreateContext(this->device, NULL);
-  printf("!!!!!!!!!!!!!!!!!!%d\n", __LINE__);
-  SoundEngine::checkError("Error creating Context", __LINE__);
-  //alcMakeContextCurrent(this->context);
-  printf("!!!!!!!!!!!!!!!!!!%d\n", __LINE__);
-  this->checkError("Making Context Current", __LINE__);
+  this->checkALCError("Error creating Context", __LINE__);
+
+  alcMakeContextCurrent(this->context);
+  this->checkALCError("Making Context Current", __LINE__);
   // #endif
 
@@ -376 +373 @@
   else
     return true;
+}
+
+bool SoundEngine::checkALCError(const char* 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));
+    return false;
+  }
+  else
+    return true;
+}
+
+
+
+void SoundEngine::listDevices()
+{
+  printf("%s\n",(const char*)alcGetString(NULL, ALC_DEVICE_SPECIFIER));
 }
 
@@ -401 +417 @@
 }
 
-void SoundEngine::listDevices()
-{
-  printf("%s\n",(const char*)alcGetString(NULL, ALC_DEVICE_SPECIFIER));
-}
-
 
 const char* SoundEngine::getALCErrorString(ALenum err)
@@ -412 +423 @@
     {
     case ALC_NO_ERROR:
-      return ("AL_NO_ERROR\n");
+      return ("AL_NO_ERROR");
     case ALC_INVALID_DEVICE:
-      return ("ALC_INVALID_DEVICE\n");
+      return ("ALC_INVALID_DEVICE");
     case ALC_INVALID_CONTEXT:
-      return("ALC_INVALID_CONTEXT\n");
+      return("ALC_INVALID_CONTEXT");
     case ALC_INVALID_ENUM:
-      return("ALC_INVALID_ENUM\n");
+      return("ALC_INVALID_ENUM");
     case ALC_INVALID_VALUE:
-      return ("ALC_INVALID_VALUE\n");
+      return ("ALC_INVALID_VALUE");
     case ALC_OUT_OF_MEMORY:
-      return("ALC_OUT_OF_MEMORY\n");
+      return("ALC_OUT_OF_MEMORY");
     };
 }

trunk/src/lib/sound/sound_engine.h

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