Changeset 7284 in orxonox.OLD

Timestamp:

Apr 13, 2006, 8:52:41 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: sound plays again… hmm… this was a very stupid bug in MultiType… hope it is fixed now, but who knows…

Location:

trunk/src/lib

Files:

• sound/sound_engine.cc (modified) (6 diffs)
• sound/sound_source.cc (modified) (2 diffs)
• util/multi_type.cc (modified) (2 diffs)

trunk/src/lib/sound/sound_engine.cc

@@ -99 +99 @@
 {
   MultiType channels = Preferences::getInstance()->getString(CONFIG_SECTION_AUDIO, CONFIG_NAME_AUDIO_CHANNELS, "32");
+  printf("==== THIS IS A TEST ");
+  channels.debug();
   this->maxSourceCount = channels.getInt();
 
@@ -138 +140 @@
 void SoundEngine::popALSource(ALuint& source)
 {
-  if (source != 0)
-    return;
-  else
-  {
-
-    /// @TODO try to create more sources if needed
-    if (!this->ALSources.empty())
-    {
-      source = this->ALSources.top();
-      this->ALSources.pop();
-    }
-  }
+  assert (source == 0);
+
+  /// @TODO try to create more sources if needed
+  if (!this->ALSources.empty())
+  {
+    source = this->ALSources.top();
+    this->ALSources.pop();
+  }
+
 }
 
@@ -272 +271 @@
 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:
-//   char deviceName[] =
-//   #ifdef __WIN32__
-//     "Direct3D";
-//   #else
-//     "'( ( devices '( native null ) ) )";
-//   #endif
+  //   char deviceName[] =
+  //   #ifdef __WIN32__
+  //     "Direct3D";
+  //   #else
+  //     "'( ( devices '( native null ) ) )";
+  //   #endif
 
   this->device = alcOpenDevice(NULL);
@@ -312 +311 @@
   // #endif
 
+  printf ("===== SOURCECOUNT: %d\n", this->maxSourceCount);
   this->setDopplerValues(SOUND_DOPPLER_FACTOR, SOUND_DOPPLER_VELOCITY);
   this->allocateSources(this->maxSourceCount);
@@ -409 +409 @@
 {
   switch(err)
-    {
+  {
     case ALC_NO_ERROR:
       return ("AL_NO_ERROR");
@@ -422 +422 @@
     case ALC_OUT_OF_MEMORY:
       return("ALC_OUT_OF_MEMORY");
-    };
-}
-
+  };
+}
+

trunk/src/lib/sound/sound_source.cc

@@ -68 +68 @@
   if (unlikely(this->sourceID == 0))
     SoundEngine::getInstance()->popALSource(this->sourceID);
+  assert (this->sourceID != 0);
 
   alSourceStop(this->sourceID);
@@ -76 +77 @@
     alSourcei (this->sourceID, AL_BUFFER, this->buffer->getID());
   this->bPlay = true;
+  printf("%d\n", this->sourceID);
+
 }
 

trunk/src/lib/util/multi_type.cc

@@ -296 +296 @@
   else if (this->type & MT_STRING)
   {
-    if (this->storedString == "") return 0;
-    char* endPtr = NULL;
-    int result = strtol(this->storedString.c_str(), &endPtr, 10);
-    if ( endPtr >= this->storedString.c_str() && endPtr < this->storedString.c_str() + strlen(this->storedString.c_str()))
-      return 0;
-    else
-      return result;
+    std::stringstream ssStream(this->storedString);
+    int iReturn;
+    ssStream >> iReturn;
+    return iReturn;
   }
   return 0;
@@ -323 +320 @@
     char* endPtr = NULL;
     double result = strtod(this->storedString.c_str(), &endPtr);
-    if ( endPtr >= this->storedString.c_str() && endPtr < this->storedString.c_str() + strlen(this->storedString.c_str()))
+    if ( endPtr >= this->storedString.c_str() && endPtr < this->storedString.c_str() + this->storedString.size())
       return 0.0f;
     else