Changeset 1747 for code/trunk/src/audio

Timestamp:

Sep 9, 2008, 4:25:52 AM (16 years ago)

Author:

landauf

Message:

merged core3 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/audio/AudioIncludes.h (modified) (1 diff)
• src/audio/AudioManager.cc (modified) (1 diff)
• src/audio/AudioManager.h (modified) (1 diff)
• src/audio/AudioStream.cc (modified) (1 diff)

code/trunk/src/audio/AudioIncludes.h

@@ -47 +47 @@
 #include <vorbis/vorbisfile.h>
 
-#include "core/Error.h"
+#include "util/Error.h"

code/trunk/src/audio/AudioManager.cc

@@ -36 +36 @@
 #include "AudioSource.h"
 #include "AudioStream.h"
-#include "core/Error.h"
-#include "core/Debug.h"
+#include "util/Error.h"
+#include "util/Debug.h"
 
 namespace audio

code/trunk/src/audio/AudioManager.h

@@ -58 +58 @@
                 void setOri(std::vector<float> at, std::vector<float> up);
 
-                // Parses given xml string
-                void loadParams();
-
                 // Update
                 void tick(float dt);

code/trunk/src/audio/AudioStream.cc

@@ -28 +28 @@
 #include "AudioStream.h"
 
-#include "core/Debug.h"
-#include "core/Error.h"
+#include "util/Debug.h"
+#include "util/Error.h"
 
 namespace audio