Creating methods to control volume of music and sound effects

fgagamedev · Jun 28, 2016 · 2cfe466 · 2cfe466
1 parent 189e32d
commit 2cfe466
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 10 deletions.
diff --git a/include/engine.h b/include/engine.h
@@ -43,8 +43,9 @@ namespace ijengine {
 
         void play_sound_effect(const string &path);
 
-        void set_audio_volume();
-        void set_sound_effect_volume();
+        int set_audio_volume(double percentage);
+        int set_sound_effect_volume(double percentage);
+
     }
 
     namespace event {

diff --git a/include/kernel.h b/include/kernel.h
@@ -34,6 +34,9 @@ namespace ijengine {
         virtual void stop_audio() = 0;
         virtual void play_sound_effect(const string& path) = 0;
 
+        virtual int set_audio_volume(double percentage) = 0;
+        virtual int set_sound_effect_volume(double percentage) = 0;
+
 	virtual list<MouseEvent> pending_mouse_events(unsigned now) = 0;
 	virtual list<SystemEvent> pending_system_events(unsigned now) = 0;
 	virtual list<KeyboardEvent> pending_keyboard_events(unsigned now) = 0;

diff --git a/kernel/sdl2/sdl2kernel.cpp b/kernel/sdl2/sdl2kernel.cpp
@@ -289,7 +289,6 @@ SDL2Kernel::stop_audio()
 void
 SDL2Kernel::play_sound_effect(const string& path)
 {
-    //string sound_effect_path = audio_dir_path + "/effects/" + path;
     Mix_Chunk *effect = Mix_LoadWAV(path.c_str());
 
     if(not effect){
@@ -299,6 +298,29 @@ SDL2Kernel::play_sound_effect(const string& path)
     Mix_PlayChannel(-1, effect, 0);
 }
 
+int
+SDL2Kernel::set_audio_volume(double percentage)
+{
+    double new_volume = (MIX_MAX_VOLUME * percentage);
+
+    // Mix_VolumeMusic(int volume)
+    // if volume is -1, returns current volume
+    int d = Mix_VolumeMusic(new_volume);
+
+    return d;
+}
+
+int
+SDL2Kernel::set_sound_effect_volume(double percentage){
+    double new_volume = (MIX_MAX_VOLUME * percentage);
+
+    // Mix_Volume(channel, volume)
+    // if channel is -1, set volume to all channels
+    int d = Mix_Volume(-1, new_volume);
+
+    return d;
+}
+
 void
 SDL2Kernel::update_pending_events(unsigned now)
 {

diff --git a/kernel/sdl2/sdl2kernel.h b/kernel/sdl2/sdl2kernel.h
@@ -23,6 +23,8 @@ class SDL2Kernel : public Kernel {
     void play_audio_from_path(const string& title);
     void stop_audio();
     void play_sound_effect(const string& path);
+    int set_audio_volume(double percentage);
+    int set_sound_effect_volume(double percentage);
 
     list<MouseEvent> pending_mouse_events(unsigned now);
     list<SystemEvent> pending_system_events(unsigned now);

diff --git a/src/engine.cpp b/src/engine.cpp
@@ -105,7 +105,7 @@ namespace ijengine
         void
         stop_audio()
         {
-           kernel->stop_audio();
+            kernel->stop_audio();
         }
 
         void
@@ -114,16 +114,16 @@ namespace ijengine
             kernel->play_sound_effect(path);
         }
 
-        void
-        set_audio_volume(int volume)
+        int
+        set_audio_volume(double percentage)
         {
-           kernel->set_audio_volume(volume); 
+            return kernel->set_audio_volume(percentage);
         }
 
-        void
-        set_sound_effect_volume(int volume)
+        int
+        set_sound_effect_volume(double percentage)
         {
-            kernel->set_sound_effect_volume(volume);
+            return kernel->set_sound_effect_volume(percentage);
         }
     }