Changeset 2967 for code/branches

Timestamp:

May 11, 2009, 3:29:23 PM (16 years ago)

Author:

erwin

Message:

SoundBase now loads files relative to the mediapath

Location:

code/branches/sound/src

Files:

• CMakeLists.txt (modified) (1 diff)
• orxonox/CMakeLists.txt (modified) (1 diff)
• orxonox/sound/SoundBase.cc (modified) (3 diffs)
• orxonox/sound/SoundBase.h (modified) (2 diffs)

code/branches/sound/src/CMakeLists.txt

@@ -141 +141 @@
 ADD_SUBDIRECTORY(util)
 ADD_SUBDIRECTORY(core)
-ADD_SUBDIRECTORY(sound)
 ADD_SUBDIRECTORY(network)
 ADD_SUBDIRECTORY(orxonox)

code/branches/sound/src/orxonox/CMakeLists.txt

@@ -54 +54 @@
   ${OPENAL_LIBRARY}
   ${ALUT_LIBRARY}
-  #${VORBISFILE_LIBRARY}
-  #${VORBIS_LIBRARY}
-  #${OGG_LIBRARY}
+  ${VORBISFILE_LIBRARY}
+  ${VORBIS_LIBRARY}
+  ${OGG_LIBRARY}
   ogreceguirenderer_orxonox
   tinyxml++_orxonox

code/branches/sound/src/orxonox/sound/SoundBase.cc

@@ -26 +26 @@
  *
  */
+#include <AL/alut.h>
+#include <vorbis/vorbisfile.h>
 
 #include "orxonox/objects/worldentities/WorldEntity.h"
@@ -128 +130 @@
 
     bool SoundBase::loadFile(std::string filename) {
+        filename = Core::getMediaPathString() + "/audio/" + filename;
         COUT(3) << "OpenAL ALUT: loading file " << filename << std::endl;
         this->buffer_ = alutCreateBufferFromFile(filename.c_str());
         if(this->buffer_ == AL_NONE) {
             COUT(2) << "OpenAL ALUT: " << alutGetErrorString(alutGetError()) << std::endl;
-            return false;
+            if(filename.find("ogg", 0) != string::npos)
+            {
+                this->buffer_ = loadOggFile(filename);
+            }
+
+            if(this->buffer_ == AL_NONE) 
+                return false;
         }
 
@@ -149 +158 @@
         return state;
     }
+    
+    ALuint SoundBase::loadOggFile(std::string filename)
+    {
+        // just a dummy
+        return AL_NONE;
+    }
 } // namespace: orxonox

code/branches/sound/src/orxonox/sound/SoundBase.h

@@ -30 +30 @@
 
 #include <AL/al.h>
-#include <AL/alut.h>
 #include <string>
 
@@ -62 +61 @@
 
     private:
+        ALuint loadOggFile(std::string filename);
         ALuint source_;
         ALuint buffer_;