Refactored sound code

 * fixed formatting and naming to be uniform with rest of code
 * moved default implementation of CSound to cpp module

1 files changed, 78 insertions, 74 deletions

diff --git a/src/sound/oalsound/channel.h b/src/sound/oalsound/channel.h
index c0b0436..a04b509 100644
--- a/src/sound/oalsound/channel.h
+++ b/src/sound/oalsound/channel.h
@@ -14,10 +14,18 @@
 // * You should have received a copy of the GNU General Public License
 // * along with this program. If not, see  http://www.gnu.org/licenses/.
 
-// channel.h
+/**
+ * \file channel.h
+ * \brief OpenAL channel
+ */
 
 #pragma once
 
+#include "sound/sound.h"
+
+#include "sound/oalsound/buffer.h"
+#include "sound/oalsound/check.h"
+
 #include <string>
 #include <deque>
 #include <cassert>
@@ -25,11 +33,6 @@
 #include <AL/al.h>
 #include <AL/alc.h>
 
-#include "sound/sound.h"
-
-#include "buffer.h"
-#include "check.h"
-
 struct SoundOper
 {
     float finalAmplitude;
@@ -42,72 +45,73 @@ struct SoundOper
 
 class Channel
 {
-    public:
-        Channel();
-        ~Channel();
-
-        bool Play();
-        bool Stop();
-
-        bool SetPan(Math::Vector);
-        void SetPosition(Math::Vector);
-        Math::Vector GetPosition();
-
-        bool SetFrequency(float);
-        float GetFrequency();
-
-        float GetCurrentTime();
-        void SetCurrentTime(float);
-        float GetDuration();
-
-        bool SetVolume(float);
-        float GetVolume();
-        void SetVolumeAtrib(float);
-        float GetVolumeAtrib();
-
-        bool IsPlaying();
-        bool IsReady();
-        bool IsLoaded();
-
-        bool SetBuffer(Buffer *);
-        bool FreeBuffer();
-
-        bool HasEnvelope();
-        SoundOper& GetEnvelope();
-        void PopEnvelope();
-
-        int GetPriority();
-        void SetPriority(int);
-
-        void SetStartAmplitude(float);
-        void SetStartFrequency(float);
-        void SetChangeFrequency(float);
-
-        float GetStartAmplitude();
-        float GetStartFrequency();
-        float GetChangeFrequency();
-        float GetInitFrequency();
-
-        void AddOper(SoundOper);
-        void ResetOper();
-        Sound GetSoundType();
-        void SetLoop(bool);
-        void Mute(bool);
-        bool IsMuted();
-
-    private:
-        Buffer *mBuffer;
-        ALuint mSource;
-
-        int mPriority;
-        float mStartAmplitude;
-        float mStartFrequency;
-        float mChangeFrequency;
-        float mInitFrequency;
-        float mVolume;
-        std::deque<SoundOper> mOper;
-        bool mReady;
-        bool mLoop;
-        bool mMute;
-        Math::Vector mPosition;
+public:
+    Channel();
+    ~Channel();
+
+    bool Play();
+    bool Stop();
+
+    bool SetPan(Math::Vector);
+    void SetPosition(Math::Vector);
+    Math::Vector GetPosition();
+
+    bool SetFrequency(float);
+    float GetFrequency();
+
+    float GetCurrentTime();
+    void SetCurrentTime(float);
+    float GetDuration();
+
+    bool SetVolume(float);
+    float GetVolume();
+    void SetVolumeAtrib(float);
+    float GetVolumeAtrib();
+
+    bool IsPlaying();
+    bool IsReady();
+    bool IsLoaded();
+
+    bool SetBuffer(Buffer *);
+    bool FreeBuffer();
+
+    bool HasEnvelope();
+    SoundOper& GetEnvelope();
+    void PopEnvelope();
+
+    int GetPriority();
+    void SetPriority(int);
+
+    void SetStartAmplitude(float);
+    void SetStartFrequency(float);
+    void SetChangeFrequency(float);
+
+    float GetStartAmplitude();
+    float GetStartFrequency();
+    float GetChangeFrequency();
+    float GetInitFrequency();
+
+    void AddOper(SoundOper);
+    void ResetOper();
+    Sound GetSoundType();
+    void SetLoop(bool);
+    void Mute(bool);
+    bool IsMuted();
+
+private:
+    Buffer *m_buffer;
+    ALuint m_source;
+
+    int m_priority;
+    float m_startAmplitude;
+    float m_startFrequency;
+    float m_changeFrequency;
+    float m_initFrequency;
+    float m_volume;
+    std::deque<SoundOper> m_oper;
+    bool m_ready;
+    bool m_loop;
+    bool m_mute;
+    Math::Vector m_position;
 };
+