Added volume setting to Sound

include/Sound.h

@@ -45,6 +45,17 @@ public:
     int registeredSources();
 
     /*!
+     * \brief Remove all loaded sounds
+     */
+    void clear();
+
+    /*!
+     * \brief Set the volume
+     * \param vol new source gain
+     */
+    void setVolume(float vol);
+
+    /*!
      * \brief Move listener and repositions them
      * \param pos New position for listener
      * \param angle New orientation for listener
@@ -78,11 +89,6 @@ public:
     int addWave(unsigned char *wav, unsigned int length, int *source, unsigned int flags);
 
     /*!
-     * \brief Remove all loaded sounds
-     */
-    void clear();
-
-    /*!
      * \brief Play sound source
      * \param source sound source to play
      */
@@ -97,6 +103,7 @@ public:
 private:
 
     bool mInit;                        //!< Guard to ensure ausio system is active
+    float mVolume;                     //!< Listener gain
     std::vector<unsigned int> mBuffer; //!< Audio buffer id list
     std::vector<unsigned int> mSource; //!< Audio source id list
 };

src/Sound.cpp

@@ -28,6 +28,7 @@
 
 Sound::Sound() {
     mInit = false;
+    mVolume = 1.0f;
 }
 
 Sound::~Sound() {
@@ -36,6 +37,8 @@ Sound::~Sound() {
 }
 
 int Sound::init() {
+    assert(mInit == false);
+
 #ifndef __APPLE__
     int fd;
 
@@ -71,6 +74,32 @@ int Sound::registeredSources() {
     return mSource.size();
 }
 
+void Sound::clear() {
+    assert(mInit == true);
+    assert(mSource.size() == mBuffer.size());
+
+    for (size_t i = 0; i < mSource.size(); i++) {
+        alDeleteSources(1, &mSource[i]);
+        alDeleteBuffers(1, &mBuffer[i]);
+    }
+
+    mSource.clear();
+    mBuffer.clear();
+}
+
+void Sound::setVolume(float vol) {
+    assert(mInit == true);
+    assert(mSource.size() == mBuffer.size());
+
+    if ((mSource.size() > 0) && (mVolume != vol)) {
+        // Apply new volume to old sources if needed
+        for (size_t i = 0; i < mSource.size(); i++)
+            alSourcef(mSource[i], AL_GAIN, vol);
+    }
+
+    mVolume = vol;
+}
+
 void Sound::listenAt(float pos[3], float angle[3]) {
     assert(mInit == true);
     assert(mSource.size() == mBuffer.size());
@@ -138,6 +167,8 @@ int Sound::addFile(const char *filename, int *source, unsigned int flags)
         alSourcei(mSource[id], AL_LOOPING, 1);
     }
 
+    alSourcef(mSource[id], AL_GAIN, mVolume);
+
     *source = id;
 
     return 0;
@@ -194,6 +225,8 @@ int Sound::addWave(unsigned char *wav, unsigned int length, int *source, unsigne
         alSourcei(mSource[id], AL_LOOPING, 1);
     }
 
+    alSourcef(mSource[id], AL_GAIN, mVolume);
+
     *source = id;
 
     //! \fixme Should free alut buffer?
@@ -201,19 +234,6 @@ int Sound::addWave(unsigned char *wav, unsigned int length, int *source, unsigne
     return 0;
 }
 
-void Sound::clear() {
-    assert(mInit == true);
-    assert(mSource.size() == mBuffer.size());
-
-    for (size_t i = 0; i < mSource.size(); i++) {
-        alDeleteSources(1, &mSource[i]);
-        alDeleteBuffers(1, &mBuffer[i]);
-    }
-
-    mSource.clear();
-    mBuffer.clear();
-}
-
 void Sound::play(int source) {
     assert(mInit == true);
     assert(mSource.size() == mBuffer.size());