Changeset 6856 in orxonox.OLD

Timestamp:

Jan 30, 2006, 4:07:29 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: testing if this works everywhere

File:

• trunk/src/lib/sound/sound_engine.cc (modified) (2 diffs)

trunk/src/lib/sound/sound_engine.cc

@@ -273 +273 @@
 bool SoundEngine::initAudio()
 {
-  ALenum result;
-  PRINTF(3)("Initialisazing openAL sound engine\n");
-  const char* defaultDevice =(const char*) alcGetString(NULL, ALC_DEFAULT_DEVICE_SPECIFIER);
-  const char* deviceList = (const char*)alcGetString(NULL,ALC_DEVICE_SPECIFIER);
-  const char* devWalk = deviceList;
-  //  if (alcIsExtensionPresent(NULL, (const ALCchar*)"ALC_ENUMERATION_EXT") == AL_TRUE)
-  { // try out enumeration extension
-    PRINTF(3)("Enumeration-extension found\n");
-
-    PRINTF(3)("Default device: %s\n", defaultDevice);
-    do
-    {
-      PRINTF(3)("%s\n", devWalk);
-      devWalk += strlen(devWalk)+1;
-    }
-    while (devWalk[0] != '\0');
-
-
-
-  }
+//   ALenum result;
+//   PRINTF(3)("Initialisazing openAL sound engine\n");
+//   const char* defaultDevice =(const char*) alcGetString(NULL, ALC_DEFAULT_DEVICE_SPECIFIER);
+//   const char* deviceList = (const char*)alcGetString(NULL,ALC_DEVICE_SPECIFIER);
+//   const char* devWalk = deviceList;
+//   //  if (alcIsExtensionPresent(NULL, (const ALCchar*)"ALC_ENUMERATION_EXT") == AL_TRUE)
+//   { // try out enumeration extension
+//     PRINTF(3)("Enumeration-extension found\n");
+//
+//     PRINTF(3)("Default device: %s\n", defaultDevice);
+//     do
+//     {
+//       PRINTF(3)("%s\n", devWalk);
+//       devWalk += strlen(devWalk)+1;
+//     }
+//     while (devWalk[0] != '\0');
+//  }
 
   // INITIALIZING THE DEVICE:
-  /*
-  #ifdef AL_VERSION_1_1
-    ALCchar deviceName[] =
-
+  unsigned char deviceName[] =
   #ifdef __WIN32__
         "Direct3D";
@@ -304 +298 @@
         "'( ( devices '( native null ) ) )";
   #endif
-    //
-    this->device = alcOpenDevice(deviceName);
-
-    this->context = alcCreateContext(this->device, NULL);
-
-    alcMakeContextCurrent(this->context);
-  #else*/
-  this->device = alcOpenDevice(NULL);
-  this->checkError("Error opening Device", __LINE__);
+
+  this->device = alcOpenDevice(deviceName);
+  this->checkALCError("opening Device", __LINE__);
+  printf("%p\n", this->device);
+
+  printf("Audio-Specifier: %s\n", (const char*)alcGetString(this->device, ALC_DEVICE_SPECIFIER));
+  printf("Audio-Extensions: %s\n", (const char*)alcGetString(this->device, ALC_EXTENSIONS));
+
 
   this->context = alcCreateContext(this->device, NULL);
-  this->checkALCError("Error creating Context", __LINE__);
-
-  //alcMakeContextCurrent(this->context);
-  this->checkALCError("Making Context Current", __LINE__);
+  this->checkALCError("creating Context", __LINE__);
+
+  alcMakeContextCurrent(this->context);
+  this->checkALCError("making Context Current", __LINE__);
   // #endif
-
-  if ((result = alGetError()) != AL_NO_ERROR)
-    PRINTF(2)("%s\n", SoundEngine::getALErrorString(result));
 
   this->setDopplerValues(SOUND_DOPPLER_FACTOR, SOUND_DOPPLER_VELOCITY);