Changeset 1784 for code/trunk/src/audio/AudioManager.h

Timestamp:

Sep 15, 2008, 10:54:25 AM (16 years ago)

Author:

rgrieder

Message:

• removed obsolete Convert.h includes (possibly from old XML loading)
• replaced tabs in audio library, plus minor code cleanup because removing the tabs screwed layout
• replaced all "#define name number" with "const Type name = number" if possible

File:

• code/trunk/src/audio/AudioManager.h (modified) (1 diff)

code/trunk/src/audio/AudioManager.h

@@ -37 +37 @@
 namespace audio
 {
-  class _AudioExport AudioManager
-        {
-        public:
+    class _AudioExport AudioManager
+    {
+    public:
+        // Init audio
+        AudioManager();
 
-                // Init audio
-                AudioManager();
+        // Kill audio and set buffers, sources and memory free
+        ~AudioManager();
 
-                // Kill audio and set buffers, sources and memory free
-                ~AudioManager();
+        // Set listener position
+        void setPos(std::vector<float> newPosition);
 
-                // Set listener position
-                void setPos(std::vector<float> newPosition);
+        // Set listener speed
+        void setSpeed(std::vector<float> newSpeed);
 
-                // Set listener speed
-                void setSpeed(std::vector<float> newSpeed);
+        // Set listener orientation (first is direction
+        // the listener looks at, the second is the direction
+        // upwards the listener)
+        void setOri(std::vector<float> at, std::vector<float> up);
 
-                // Set listener orientation (first is direction
-                // the listener looks at, the second is the direction
-                // upwards the listener)
-                void setOri(std::vector<float> at, std::vector<float> up);
+        // Update
+        void tick(float dt);
 
-                // Update
-                void tick(float dt);
+        void ambientAdd(std::string file);
+        void ambientStart();
+        void ambientStop();
 
-                void ambientAdd(std::string file);
-                void ambientStart();
-                void ambientStop();
-
-        private:
-
-                // Background sound
-    std::vector<AudioStream*> bgSounds;
-                int currentBgSound;
+    private:
+        // Background sound
+        std::vector<AudioStream*> bgSounds;
+        int currentBgSound;
 
 
+        std::string ambientPath;
 
-                std::string ambientPath;
+        // Vector containing all audio files
+        std::vector<AudioBuffer*> buffers;
+        // Vector containing all audio sources which referer to one buffer
+        std::vector<AudioSource*> sources;
+        // The ambient background sound
+        AudioSource* ambient;
 
-                // Vector containing all audio files
-                std::vector<AudioBuffer*> buffers;
-                // Vector containing all audio sources which referer to one buffer
-                std::vector<AudioSource*> sources;
-                // The ambient background sound
-                AudioSource* ambient;
-
-                std::vector<float> listenerPosition;
-                std::vector<float> listenerSpeed;
-                std::vector<float> listenerAt;
-                std::vector<float> listenerup;
-        };
+        std::vector<float> listenerPosition;
+        std::vector<float> listenerSpeed;
+        std::vector<float> listenerAt;
+        std::vector<float> listenerup;
+    };
 }