Changeset 6847 in orxonox.OLD for trunk

Timestamp:

Jan 30, 2006, 2:45:53 AM (19 years ago)

Author:

bensch

Message:

trunk: should work again

Location:

trunk/src/lib/sound

Files:

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

trunk/src/lib/sound/sound_engine.cc

@@ -293 +293 @@
 
   }
+
   // INITIALIZING THE DEVICE:
   /*
@@ -310 +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->context = alcCreateContext(this->device, NULL);
+  printf("!!!!!!!!!!!!!!!!!!%d\n", __LINE__);
   SoundEngine::checkError("Error creating Context", __LINE__);
-  alcMakeContextCurrent(this->context);
+  //alcMakeContextCurrent(this->context);
+  printf("!!!!!!!!!!!!!!!!!!%d\n", __LINE__);
   this->checkError("Making Context Current", __LINE__);
   // #endif
@@ -400 +406 @@
 }
 
-/*
-void SoundEngine::PrintALCErrorString(ALenum err)
+
+const char* SoundEngine::getALCErrorString(ALenum err)
 {
   switch(err)
     {
     case ALC_NO_ERROR:
-      PRINTF(4)("AL_NO_ERROR\n");
-      break;
-
+      return ("AL_NO_ERROR\n");
     case ALC_INVALID_DEVICE:
-      PRINTF(2)("ALC_INVALID_DEVICE\n");
-      break;
-
+      return ("ALC_INVALID_DEVICE\n");
     case ALC_INVALID_CONTEXT:
-      PRINTF(2)("ALC_INVALID_CONTEXT\n");
-      break;
-
+      return("ALC_INVALID_CONTEXT\n");
     case ALC_INVALID_ENUM:
-      PRINTF(2)("ALC_INVALID_ENUM\n");
-      break;
-
+      return("ALC_INVALID_ENUM\n");
     case ALC_INVALID_VALUE:
-      PRINTF(2)("ALC_INVALID_VALUE\n");
-      break;
-
+      return ("ALC_INVALID_VALUE\n");
     case ALC_OUT_OF_MEMORY:
-      PRINTF(2)("ALC_OUT_OF_MEMORY\n");
-      break;
+      return("ALC_OUT_OF_MEMORY\n");
     };
 }
-*/
+

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);
     static const char* getALErrorString(ALenum err);
+    static const char* getALCErrorString(ALenum err);
 
   private: