Changeset 3889 in orxonox.OLD

Timestamp:

Apr 19, 2005, 1:21:14 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/sound_engine: sound gets enabled

Location:

orxonox/branches/sound_engine/src

Files:

• lib/sound/sound_engine.cc (modified) (4 diffs)
• lib/sound/sound_engine.h (modified) (2 diffs)
• orxonox.cc (modified) (5 diffs)

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

@@ -19 +19 @@
 
 #include "sound_engine.h"
+#include <SDL_mixer.h>
 
 using namespace std;
@@ -28 +29 @@
 {
    this->setClassName ("SoundEngine");
+
+   // preInit
    this->isInit = false;
+   this->frequency = SOUND_DEFAULT_FREQUENCY;
+   this->format = MIX_DEFAULT_FORMAT;
+   this->channels = SOUND_DEFAULT_CHANNELS;
+   this->buffers = SOUND_DEFAULT_BUFIZE;
+
    this->enableSound();
 }
 
-//! brief the singleton reference to this class
+/**
+   \brief the singleton reference to this class
+*/
 SoundEngine* SoundEngine::singletonRef = NULL;
 
@@ -63 +73 @@
 {
   if (!this->isInit)
-    if (SDL_Init(SDL_INIT_AUDIO))
-      {
-        PRINTF(1)("SDL-sound could not be initialized\n");
-        return;
-      }
-  this->isInit = true;
+    {
+      if (SDL_Init(SDL_INIT_AUDIO) == -1)
+        {
+          PRINTF(1)("SDL-sound could not be initialized\nSDL_Init: %s\n", SDL_GetError());
+          return;
+        }
+      else
+        {
+          this->isInit = true;
+          
+          // checking if the mode is supported
+          Mix_QuerySpec(&this->frequency, &this->format, &this->channels);
+          
+          this->bits = this->format & 0xFF;
+          PRINTF(3)("Opened audio at %d Hz %d bit %s, %d bytes audio buffer\n",
+                    this->frequency, this->bits, this->channels > 1 ? "stereo" : "mono", this->buffers); 
+          Mix_VolumeMusic(this->volume);
+          
+          if(Mix_OpenAudio(this->frequency, this->format, this->channels, this->buffers) == -1)
+            PRINTF(1)("Mix_OpenAudio: %s\n", Mix_GetError());
+        }
+  
+
+    }
 }
 
@@ -78 +106 @@
   if (this->isInit)
     {
-      SDL_QuitSubSystem(SDL_INIT_AUDIO);
+      Mix_CloseAudio();
     }
   else

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

@@ -25 +25 @@
 #include <SDL_mixer.h>
 
+#define SOUND_DEFAULT_FREQUENCY 44100
+#define SOUND_DEFAULT_CHANNELS 2
+#define SOUND_DEFAULT_BUFIZE 16384
+
 // FORWARD DEFINITION
 
@@ -44 +48 @@
   static bool checkVersion(void);
 
+
+  // settings
+  int volume;
+
+  // audio specifications
+  int frequency;
+  Uint16 format;
+  int channels;
+  int bits;
+  int buffers;
+
   bool isInit;
 };

orxonox/branches/sound_engine/src/orxonox.cc

@@ -33 +33 @@
 #include "graphics_engine.h"
 #include "sound_engine.h"
+#include "text_engine.h"
 #include "resource_manager.h"
-#include "text_engine.h"
+
 
 #include <string.h>
@@ -59 +60 @@
   if( resources != NULL) delete resources;
   delete GraphicsEngine::getInstance(); // delets the Graphics Engine
-  delete SoundEngine::getInstance();    // deletes the Sound Engine
+  //  delete SoundEngine::getInstance();    // deletes the Sound Engine
   delete ResourceManager::getInstance(); // deletes the Resource Manager
   delete TextEngine::getInstance();
@@ -126 +127 @@
 }
 
-
 /**
    \brief initializes the sound engine
@@ -138 +138 @@
 }
 
-
 /**
    \brief initializes input functions
@@ -149 +148 @@
   return 0;
 }
-
 
 /**