Changeset 7221 in orxonox.OLD for trunk/src/lib/sound

Timestamp:

Mar 15, 2006, 3:10:45 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the std-branche back, it runs on windows and Linux

svn merge ​https://svn.orxonox.net/orxonox/branches/std . -r7202:HEAD

Location:

trunk/src/lib/sound

Files:

• ogg_player.cc (modified) (4 diffs)
• ogg_player.h (modified) (1 diff)
• sound_buffer.cc (modified) (3 diffs)
• sound_buffer.h (modified) (1 diff)
• sound_engine.cc (modified) (2 diffs)
• sound_engine.h (modified) (1 diff)

trunk/src/lib/sound/ogg_player.cc

@@ -31 +31 @@
  * @param fileName the file to load
  */
-OggPlayer::OggPlayer(const char* fileName)
+OggPlayer::OggPlayer(const std::string& fileName)
 {
   this->setClassID(CL_SOUND_OGG_PLAYER, "OggPlayer");
@@ -40 +40 @@
   this->buffers[1] = 0;
 
-  if (fileName != NULL)
+  if (!fileName.empty())
   {
     if (this->open(fileName))
@@ -56 +56 @@
  * @param fileName the file to open
  */
-bool OggPlayer::open(const char* fileName)
+bool OggPlayer::open(const std::string& fileName)
 {
   if (this->buffers[0] == 0)
@@ -72 +72 @@
   int result;
 
-  if(!(oggFile = fopen(fileName, "rb")))
+  if(!(oggFile = fopen(fileName.c_str(), "rb")))
   {
     PRINTF(2)("Could not open Ogg file.");

trunk/src/lib/sound/ogg_player.h

@@ -27 +27 @@
 {
 public:
-  OggPlayer(const char* fileName = NULL);
+  OggPlayer(const std::string& fileName = "");
   virtual ~OggPlayer();
 
-  bool open(const char* fileName);
+  bool open(const std::string& fileName);
   void release();
   void debug();

trunk/src/lib/sound/sound_buffer.cc

@@ -32 +32 @@
  * @param fileName The name of the File
  */
-SoundBuffer::SoundBuffer(const char* fileName)
+SoundBuffer::SoundBuffer(const std::string& fileName)
 {
   this->setClassID(CL_SOUND_BUFFER, "SoundBuffer");
@@ -54 +54 @@
  * @returns true on success.
  */
-bool SoundBuffer::loadWAV(const char* fileName)
+bool SoundBuffer::loadWAV(const std::string& fileName)
 {
   SDL_AudioSpec wavSpec;
@@ -61 +61 @@
 
   /* Load the WAV */
-  if( SDL_LoadWAV(fileName, &wavSpec, &wavBuffer, &wavLength) == NULL)
+  if( SDL_LoadWAV(fileName.c_str(), &wavSpec, &wavBuffer, &wavLength) == NULL)
   {
-    PRINTF(2)("Could not open %s: %s\n", fileName, SDL_GetError());
+    PRINTF(2)("Could not open %s: %s\n", fileName.c_str(), SDL_GetError());
     return false;
   }

trunk/src/lib/sound/sound_buffer.h

@@ -17 +17 @@
 {
   public:
-    SoundBuffer(const char* fileName);
+    SoundBuffer(const std::string& fileName);
     virtual ~SoundBuffer();
 
-    bool loadWAV(const char* fileName);
+    bool loadWAV(const std::string& fileName);
 
     /** @returns the ID of the buffer used in this SoundBuffer */

trunk/src/lib/sound/sound_engine.cc

@@ -99 +99 @@
 void SoundEngine::loadSettings(IniParser* iniParser)
 {
-  const char* channels = iniParser->getVar(CONFIG_NAME_AUDIO_CHANNELS, CONFIG_SECTION_AUDIO, "32");
-  this->maxSourceCount = atoi(channels);
-
-  const char* effectsVolume = iniParser->getVar(CONFIG_NAME_EFFECTS_VOLUME, CONFIG_SECTION_AUDIO, "80");
-  this->effectsVolume = atof(effectsVolume)/100.0;
-
-  const char* musicVolume = iniParser->getVar(CONFIG_NAME_MUSIC_VOLUME, CONFIG_SECTION_AUDIO, "75");
-  this->musicVolume = atof(musicVolume)/100.0;
+  MultiType channels = iniParser->getVar(CONFIG_NAME_AUDIO_CHANNELS, CONFIG_SECTION_AUDIO, "32");
+  this->maxSourceCount = channels.getInt();
+
+  MultiType effectsVolume = iniParser->getVar(CONFIG_NAME_EFFECTS_VOLUME, CONFIG_SECTION_AUDIO, "80");
+  this->effectsVolume = effectsVolume.getFloat()/100.0;
+
+  MultiType musicVolume = iniParser->getVar(CONFIG_NAME_MUSIC_VOLUME, CONFIG_SECTION_AUDIO, "75");
+  this->musicVolume = musicVolume.getFloat()/100.0;
 }
 
@@ -117 +117 @@
    acctualy this is nothing more than a wrapper around the ResourceManager.
 */
-SoundSource* SoundEngine::createSource(const char* fileName, PNode* sourceNode)
+SoundSource* SoundEngine::createSource(const std::string& fileName, PNode* sourceNode)
 {
   return new SoundSource(sourceNode, (SoundBuffer*)ResourceManager::getInstance()->load(fileName, WAV, RP_LEVEL));

trunk/src/lib/sound/sound_engine.h

@@ -33 +33 @@
     void loadSettings(IniParser* iniParser);
 
-    SoundSource* createSource(const char* fileName, PNode* sourceNode = NULL);
+    SoundSource* createSource(const std::string& fileName, PNode* sourceNode = NULL);
 
     /** @param listener the listener in the scene */