Changeset 2171 for code/trunk/src/audio

Timestamp:

Nov 10, 2008, 12:05:03 AM (16 years ago)

Author:

landauf

Message:

merged revisions 2111-2170 from objecthierarchy branch back to trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/audio/AudioBuffer.cc (modified) (1 diff)
• src/audio/AudioBuffer.h (modified) (1 diff)
• src/audio/AudioManager.cc (modified) (1 diff)
• src/audio/AudioManager.h (modified) (1 diff)
• src/audio/AudioPrereqs.h (modified) (1 diff)
• src/audio/AudioSource.cc (modified) (1 diff)
• src/audio/AudioSource.h (modified) (1 diff)
• src/audio/AudioStream.cc (modified) (1 diff)
• src/audio/AudioStream.h (modified) (1 diff)

code/trunk/src/audio/AudioBuffer.cc

@@ -29 +29 @@
 #include "AudioBuffer.h"
 
-namespace audio
+namespace orxonox
 {
     AudioBuffer::AudioBuffer(std::string filename)

code/trunk/src/audio/AudioBuffer.h

@@ -35 +35 @@
 #include <AL/al.h>
 
-namespace audio
+namespace orxonox
 {
     class _AudioExport AudioBuffer

code/trunk/src/audio/AudioManager.cc

@@ -37 +37 @@
 #include "AudioStream.h"
 
-namespace audio
+namespace orxonox
 {
     AudioManager::AudioManager()

code/trunk/src/audio/AudioManager.h

@@ -35 +35 @@
 #include <string>
 
-namespace audio
+namespace orxonox
 {
     class _AudioExport AudioManager

code/trunk/src/audio/AudioPrereqs.h

@@ -60 +60 @@
 // Forward declarations
 //-----------------------------------------------------------------------
-namespace audio
+namespace orxonox
 {
   class AudioBuffer;

code/trunk/src/audio/AudioSource.cc

@@ -29 +29 @@
 #include "AudioSource.h"
 
-namespace audio
+namespace orxonox
 {
     AudioSource::AudioSource()

code/trunk/src/audio/AudioSource.h

@@ -32 +32 @@
 #include "AudioPrereqs.h"
 
-namespace audio
+namespace orxonox
 {
     class _AudioExport AudioSource

code/trunk/src/audio/AudioStream.cc

@@ -30 +30 @@
 #include "util/Debug.h"
 
-namespace audio
+namespace orxonox
 {
     AudioStream::AudioStream(std::string path)

code/trunk/src/audio/AudioStream.h

@@ -39 +39 @@
 
 
-namespace audio
+namespace orxonox
 {
     const int BUFFER_SIZE = 4096 * 4;