Starting to implement volume

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

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/include/engine.h b/include/engine.h
@@ -42,6 +42,9 @@ namespace ijengine {
         void stop_audio();
 
         void play_sound_effect(const string &path);
+
+        void set_audio_volume();
+        void set_sound_effect_volume();
     }
 
     namespace event {

diff --git a/kernel/sdl2/sdl2kernel.cpp b/kernel/sdl2/sdl2kernel.cpp
@@ -276,7 +276,7 @@ SDL2Kernel::play_audio_from_path(const string& path)
             // printf("error: %s\n", Mix_GetError());
         }
 
-        Mix_PlayMusic(audio, -1);
+        Mix_FadeInMusic(audio, -1, 2000);
     }
 }
 
@@ -289,11 +289,11 @@ 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(sound_effect_path.c_str());
+    //string sound_effect_path = audio_dir_path + "/effects/" + path;
+    Mix_Chunk *effect = Mix_LoadWAV(path.c_str());
 
     if(not effect){
-        // printf("Failed to load sound effect\n");
+        printf("Failed to load sound effect\n");
     }
 
     Mix_PlayChannel(-1, effect, 0);

diff --git a/src/engine.cpp b/src/engine.cpp
@@ -113,6 +113,18 @@ namespace ijengine
         {
             kernel->play_sound_effect(path);
         }
+
+        void
+        set_audio_volume(int volume)
+        {
+           kernel->set_audio_volume(volume); 
+        }
+
+        void
+        set_sound_effect_volume(int volume)
+        {
+            kernel->set_sound_effect_volume(volume);
+        }
     }
 
     namespace event

diff --git a/test/res/effects/boom.wav b/test/res/effects/boom.wav