Changeset 5815 in orxonox.OLD

Timestamp:

Nov 29, 2005, 1:19:24 AM (18 years ago)

Author:

bensch

Message:

orxonox/branches/world_entities: sound-engine loads devices over a System-specific string

Location:

branches/world_entities/src

Files:

• lib/sound/sound_engine.cc (modified) (3 diffs)
• lib/sound/sound_engine.h (modified) (1 diff)
• world_entities/weapons/aiming_turret.cc (modified) (1 diff)

branches/world_entities/src/lib/sound/sound_engine.cc

@@ -21 +21 @@
 #include "sound_engine.h"
 
-//#include <AL/alc.h> // maybe later
 #include "class_list.h"
 
@@ -208 +207 @@
 void SoundEngine::flushUnusedBuffers()
 {
+  /// FIXME
 /*  if(this->sourceList && this->bufferList)
   {
@@ -280 +280 @@
   }
 
-
-  alutInit(NULL, 0);
+  // INITIALIZING THE DEVICE:
+  ALCubyte deviceName[] =
+#ifdef __WIN32__
+      "native";
+#else
+      "'( ( devices '( native arts null ) ) )";
+#endif
+  //
+  this->device = alcOpenDevice(deviceName);
+
+  this->context = alcCreateContext(this->device, NULL);
+
+  alcMakeContextCurrent(this->context);
+
+
   if ((result = alGetError()) != AL_NO_ERROR)
     SoundEngine::PrintALErrorString(result);

branches/world_entities/src/lib/sound/sound_engine.h

@@ -68 +68 @@
     static SoundEngine*      singletonRef;             //!< Reference to this class
 
+    ALCdevice*               device;                   //!< the used audio-device.
+    ALCcontext*              context;                  //!< the context, currently in use.
+
     float                    musicVolume;              //!< the maximum volume of the music in % (0f,1f]
     float                    effectsVolume;            //!< the maximum volume of sound-effects in % (0f,1f]
     PNode*                   listener;                 //!< The listener of the Scene
+
     std::list<BaseObject*>*  bufferList;               //!< A list of buffers
     std::list<BaseObject*>*  sourceList;               //!< A list for all the sources in the scene.
+
 
 };

branches/world_entities/src/world_entities/weapons/aiming_turret.cc

@@ -49 +49 @@
 
   this->setActionSound(WA_SHOOT, "sound/shot1.wav");
-  this->setActionSound(WA_ACTIVATE, "sound/vocals/missiles.wav");
+  this->setActionSound(WA_ACTIVATE, "sound/voices/rockets.wav");
   this->setActionSound(WA_RELOAD, "sound/vocals/reload.wav");
 }