Changeset 6840 in orxonox.OLD

Timestamp:

Jan 30, 2006, 1:12:29 AM (18 years ago)

Author:

bensch

Message:

trunk: some minor stupid bug, that held me up for two hours

Location:

trunk/src

Files:

• lib/sound/sound_engine.cc (modified) (7 diffs)
• lib/sound/sound_engine.h (modified) (1 diff)
• orxonox.cc (modified) (1 diff)

trunk/src/lib/sound/sound_engine.cc

@@ -101 +101 @@
   const char* channels = iniParser->getVar(CONFIG_NAME_AUDIO_CHANNELS, CONFIG_SECTION_AUDIO, "32");
   this->maxSourceCount = atoi(channels);
-  const char* musicVolume = iniParser->getVar(CONFIG_NAME_MUSIC_VOLUME, CONFIG_SECTION_AUDIO, "80");
-  this->musicVolume = atof(musicVolume)/100.0;
 
   const char* effectsVolume = iniParser->getVar(CONFIG_NAME_EFFECTS_VOLUME, CONFIG_SECTION_AUDIO, "80");
   this->effectsVolume = atof(effectsVolume)/100.0;
 
-  this->allocateSources(this->maxSourceCount);
+  const char* musicVolume = iniParser->getVar(CONFIG_NAME_MUSIC_VOLUME, CONFIG_SECTION_AUDIO, "75");
+  this->musicVolume = atof(musicVolume)/100.0;
 }
 
@@ -131 +130 @@
 {
   alDopplerFactor(dopplerFactor);
+  this->checkError("Setting Doppler Factor", __LINE__);
+
   alDopplerVelocity(dopplerVelocity);
+  this->checkError("Setting Doppler Velocity", __LINE__);
 }
 
@@ -291 +293 @@
   }
   // INITIALIZING THE DEVICE:
-
+/*
 #ifdef AL_VERSION_1_1
   ALCchar deviceName[] =
@@ -306 +308 @@
 
   alcMakeContextCurrent(this->context);
-#else
+#else*/
   this->device = alcOpenDevice(NULL);
-
+  SoundEngine::checkError("Error opening Device", __LINE__);
   this->context = alcCreateContext(this->device, NULL);
-
+  SoundEngine::checkError("Error creating Context", __LINE__);
   alcMakeContextCurrent(this->context);
-  //
-#endif
+  this->checkError("Making Context Current", __LINE__);
+// #endif
 
   if ((result = alGetError()) != AL_NO_ERROR)
@@ -319 +321 @@
 
   this->setDopplerValues(SOUND_DOPPLER_FACTOR, SOUND_DOPPLER_VELOCITY);
+  this->allocateSources(this->maxSourceCount);
 }
 
@@ -329 +332 @@
 bool SoundEngine::allocateSources(unsigned int count)
 {
-  // Setting default values.
   for (unsigned int i = 0; i < count; i++)
   {
@@ -335 +337 @@
 
     alGenSources(1, &source);
-    this->checkError("loading Sources", __LINE__);
+    printf("%d %d\n", i, source);
+    this->checkError("allocate Source", __LINE__);
 
     alSourcef (source, AL_PITCH,    1.0      );

trunk/src/lib/sound/sound_engine.h

@@ -17 +17 @@
 
 #define SOUND_DOPPLER_FACTOR       0.001          //!< A factor for the audible doppler effect
-#define SOUND_DOPPLER_VELOCITY     5000000        //!< A factor for the TravelSpeed of sound
+#define SOUND_DOPPLER_VELOCITY     500            //!< A factor for the TravelSpeed of sound
 
 // FORWARD DECLARATION

trunk/src/orxonox.cc

@@ -248 +248 @@
   PRINT(3)("> Initializing sound\n");
   // SDL_InitSubSystem(SDL_INIT_AUDIO);
+  SoundEngine::getInstance();
+
+  SoundEngine::getInstance()->loadSettings(this->iniParser);
   SoundEngine::getInstance()->initAudio();
-
-  SoundEngine::getInstance()->loadSettings(this->iniParser);
   return 0;
 }