Fixup wav audio playback

WiIIiam278 · Nov 6, 2023 · 90870a9 · 90870a9
1 parent 1c2d2af
commit 90870a9
Show file tree

Hide file tree

Showing 39 changed files with 77 additions and 93 deletions.
diff --git a/nitrofiles/bgm/baby_blue.wav b/nitrofiles/bgm/baby_blue.wav
diff --git a/nitrofiles/bgm/clear_waters_1.wav b/nitrofiles/bgm/clear_waters_1.wav
diff --git a/nitrofiles/bgm/clear_waters_2.wav b/nitrofiles/bgm/clear_waters_2.wav
diff --git a/nitrofiles/bgm/rodrigo_y_gabriela.wav b/nitrofiles/bgm/rodrigo_y_gabriela.wav
diff --git a/nitrofiles/bgm/sauls_theme.wav b/nitrofiles/bgm/sauls_theme.wav
diff --git a/nitrofiles/bgm/the_cousins_1.wav b/nitrofiles/bgm/the_cousins_1.wav
diff --git a/nitrofiles/bgm/the_cousins_2.wav b/nitrofiles/bgm/the_cousins_2.wav
diff --git a/nitrofiles/bgm/the_final_cook.wav b/nitrofiles/bgm/the_final_cook.wav
diff --git a/nitrofiles/bgm/title_hook.wav b/nitrofiles/bgm/title_hook.wav
diff --git a/nitrofiles/bgm/title_loop.wav b/nitrofiles/bgm/title_loop.wav
diff --git a/nitrofiles/sfx/acceptable.raw b/nitrofiles/sfx/acceptable.raw
diff --git a/nitrofiles/sfx/acceptable.wav b/nitrofiles/sfx/acceptable.wav
diff --git a/nitrofiles/sfx/click.raw b/nitrofiles/sfx/click.raw
diff --git a/nitrofiles/sfx/click.wav b/nitrofiles/sfx/click.wav
diff --git a/nitrofiles/sfx/crank.raw b/nitrofiles/sfx/crank.raw
diff --git a/nitrofiles/sfx/crank.wav b/nitrofiles/sfx/crank.wav
diff --git a/nitrofiles/sfx/dialogue_bleep.raw b/nitrofiles/sfx/dialogue_bleep.raw
diff --git a/nitrofiles/sfx/dialogue_bleep.wav b/nitrofiles/sfx/dialogue_bleep.wav
diff --git a/nitrofiles/sfx/goodbye_walter.raw b/nitrofiles/sfx/goodbye_walter.raw
diff --git a/nitrofiles/sfx/goodbye_walter.wav b/nitrofiles/sfx/goodbye_walter.wav
diff --git a/nitrofiles/sfx/menu_drum.raw b/nitrofiles/sfx/menu_drum.raw
diff --git a/nitrofiles/sfx/menu_drum.wav b/nitrofiles/sfx/menu_drum.wav
diff --git a/nitrofiles/sfx/menu_select.raw b/nitrofiles/sfx/menu_select.raw
diff --git a/nitrofiles/sfx/menu_select.wav b/nitrofiles/sfx/menu_select.wav
diff --git a/nitrofiles/sfx/minerals.raw b/nitrofiles/sfx/minerals.raw
diff --git a/nitrofiles/sfx/minerals.wav b/nitrofiles/sfx/minerals.wav
diff --git a/nitrofiles/sfx/pestle.raw b/nitrofiles/sfx/pestle.raw
diff --git a/nitrofiles/sfx/pestle.wav b/nitrofiles/sfx/pestle.wav
diff --git a/nitrofiles/sfx/success_bell.raw b/nitrofiles/sfx/success_bell.raw
diff --git a/nitrofiles/sfx/success_bell.wav b/nitrofiles/sfx/success_bell.wav
diff --git a/nitrofiles/sfx/vaccum.raw b/nitrofiles/sfx/vaccum.raw
diff --git a/nitrofiles/sfx/vaccum.wav b/nitrofiles/sfx/vaccum.wav
diff --git a/nitrofiles/sfx/valve_turn.raw b/nitrofiles/sfx/valve_turn.raw
diff --git a/nitrofiles/sfx/valve_turn.wav b/nitrofiles/sfx/valve_turn.wav
diff --git a/sound/bgm/convert.sh b/sound/bgm/convert.sh
@@ -1,4 +1,2 @@
-# for i in *.ogg; do ffmpeg -i "$i" -y -f s8 -acodec pcm_s8 -ar 11025 -vn "../../nitrofiles/bgm/${i%.*}.raw"; done
-
-# Convert all *ogg files to 16-bit 44.1kHz PCM .wav files in ../../nitrofiles/bgm/file.wav
-for i in *.ogg; do ffmpeg -i "$i" -y -f s16le -acodec pcm_s16le -ar 44100 -vn "../../nitrofiles/bgm/${i%.*}.wav"; done
+# Converts ogg soundtrack files into metadata-stripped WAVs
+for i in *.ogg; do ffmpeg -y -i "$i" -map_metadata -1 -acodec pcm_s16le -ac 2 -ar 22050 -fflags +bitexact -flags:v +bitexact -flags:a +bitexact "../../nitrofiles/bgm/${i%.*}.wav"; done
diff --git a/sound/sfx/convert.sh b/sound/sfx/convert.sh
@@ -1 +1,2 @@
-for i in *.ogg; do ffmpeg -i "$i" -y -f s8 -acodec pcm_s8 -ar 11025 -vn "../../nitrofiles/sfx/${i%.*}.raw"; done
+# Converts ogg sfx files into metadata-stripped WAVs
+for i in *.ogg; do ffmpeg -y -i "$i" -map_metadata -1 -acodec pcm_s16le -ac 2 -ar 22050 -fflags +bitexact -flags:v +bitexact -flags:a +bitexact "../../nitrofiles/sfx/${i%.*}.wav"; done
diff --git a/source/game.cpp b/source/game.cpp
@@ -37,8 +37,7 @@ Game::Game()
     sys.mem_bank			= nullptr;
     sys.fifo_channel		= FIFO_MAXMOD;
     mmInit(&sys);
-    Audio::initAudioStream();
-    Audio::LoadSFXs();
+    Audio::SetupAudio();
 
     // Load global save
     globalSave.loadData();
@@ -1586,6 +1585,7 @@ void Game::Update()
 
     // Update sounds
     // sound.Update(frame);
+    mmStreamUpdate();
 
     // Refresh shadow OAM copy
     NF_SpriteOamSet(1);

diff --git a/source/sound.cpp b/source/sound.cpp
@@ -8,12 +8,6 @@ namespace Audio
 
     int WAV::loadWAV(const char *name)
     {
-        // consoleDemoInit();
-        // setBrightness(2, 0);
-        // setBrightness(1, 0);
-        // setBrightness(0, 0);
-        printf("Loading %s\n", name);
-
         free_();
         _loops = 0;
         char buffer[100];
@@ -101,33 +95,36 @@ namespace Audio
         _dataStart = ftell(f);
 
         _loaded = true;
-        printf("Loaded %s\n", name);
         return 0;
     }
 
     void WAV::free_()
     {
         if (!_loaded)
+        {
             return;
+        }
         delete[] _filename;
         _filename = nullptr;
         fclose(_stream);
         _stream = nullptr;
         _loaded = false;
     }
 
-    void initAudioStream()
+    void SetupAudio()
     {
+        // Setup stream
         mm_stream stream;
-
         stream.sampling_rate = 44100;
         stream.buffer_length = 8000;
         stream.callback = fillAudioStream;
         stream.format = MM_STREAM_16BIT_STEREO;
         stream.timer = MM_TIMER0;
         stream.manual = 1;
-
         mmStreamOpen(&stream);
+
+        // Load sound effects
+        LoadSFXs();
     }
 
     void WAV::play()
@@ -154,14 +151,23 @@ namespace Audio
     void WAV::stop()
     {
         if (!_active)
+        {
             return;
+        }
         _active = false;
         if (_prev != nullptr)
+        {
             _prev->_next = _next;
+        }
         else
+        {
             playingWavHead = _next;
+        }
+
         if (_next != nullptr)
+        {
             _next->_prev = _prev;
+        }
         if (deleteOnStop)
         {
             free_();
@@ -188,15 +194,23 @@ namespace Audio
     bool fillAudioStreamWav(WAV *wav, mm_word length, u16 *dest, mm_stream_formats)
     {
         if (wav == nullptr)
+        {
             return true;
+        }
         if (!wav->_active)
+        {
             return true;
+        }
         if (!wav->_loaded)
+        {
             return true;
+        }
         FILE *stream = wav->_stream;
         // TODO: convert bit depth
         if (wav->_bitsPerSample != 16)
+        {
             return true;
+        }
         // TODO: Document how sample rate change works
         u32 dstI = 0;
         // TODO: s32 addition; to clip
@@ -249,32 +263,24 @@ namespace Audio
 
     void LoadSFXs()
     {
-        // Prepare sound engine
-        // soundEnable();
-        // NF_InitRawSoundBuffers();
+        for (int sfx = 0; sfx < SFX_COUNT; sfx++)
+        {
+            auto *sfxWav = new Audio::WAV;
+            sfxWav->loadWAV(SFXS[sfx].path);
+            sfxWav->setLoops(0);
 
-
-        // Load SFX
-        // for (int i = 0; i < SFX_COUNT; i++)
-        // {
-        //     NF_LoadRawSound(SFXS[i], i, 22050, 0);
-        // }
+            soundEffects[sfx] = sfxWav;
+        }
     }
 
     void PlaySFX(SfxId sfx)
     {
-        // NF_PlayRawSound(
-        //     sfx,
-        //     127,
-        //     64,
-        //     false,
-        //     0
-        // );
+        soundEffects[sfx]->play();
     }
 
     void StopSFX()
     {
-        soundKill(0);
+
     }
 
     void PlayBGM(BgmId bgm, bool loop)

diff --git a/source/sound.hpp b/source/sound.hpp
@@ -12,6 +12,12 @@
 #include <nf_lib.h>
 #include <maxmod9.h>
 
+struct WavFile
+{
+    const char* name;
+    const char* path;
+};
+
 enum BgmId
 {
     BGM_TITLE_INTRO,
@@ -24,48 +30,6 @@ enum BgmId
     BGM_FINAL_COOK
 };
 
-struct Bgm
-{
-    const char* name;
-    const char* path;
-};
-
-const int BGM_COUNT = 8;
-const Bgm BGMS[BGM_COUNT] =
-{
-    {
-        "Breaking Bad (Title)",
-        "bgm/title_hook"
-    },
-    {
-        "Breaking Bad (Menu)",
-        "bgm/title_loop"
-    },
-    {
-        "Baby Blue (Game Over)",
-        "bgm/baby_blue"
-    },
-    {
-        "The Cousins (Superlab)",
-        "bgm/the_cousins_1"
-    },
-    {
-        "Clear Waters (Tutorial)",
-        "bgm/clear_waters_1"
-    },
-    {
-        "Rodrigo y Gabriela (Clear)",
-        "bgm/rodrigo_y_gabriela"
-    },
-    {
-        "Saul's Theme",
-        "bgm/sauls_theme"
-    },
-    {
-        "The Final Cook",
-        "bgm/the_final_cook"
-    }
-};
 
 enum SfxId
 {
@@ -83,22 +47,35 @@ enum SfxId
     SFX_MINERALS
 };
 
-// const int SFX_COUNT = 12;
-// const char* SFXS[SFX_COUNT] =
-// {
-//     {"sfx/menu_drum"},
-//     {"sfx/menu_select"},
-//     {"sfx/dialogue_bleep"},
-//     {"sfx/success_bell"},
-//     {"sfx/valve_turn"},
-//     {"sfx/goodbye_walter"},
-//     {"sfx/pestle"},
-//     {"sfx/crank"},
-//     {"sfx/click"},
-//     {"sfx/vaccum"},
-//     {"sfx/acceptable"},
-//     {"sfx/minerals"}
-// };
+const int BGM_COUNT = 8;
+const WavFile BGMS[BGM_COUNT] =
+{
+    {"Breaking Bad (Title)", "bgm/title_hook"},
+    {"Breaking Bad (Menu)", "bgm/title_loop"},
+    {"Baby Blue (Game Over)", "bgm/baby_blue"},
+    {"The Cousins (Superlab)", "bgm/the_cousins_1"},
+    {"Clear Waters (Tutorial)", "bgm/clear_waters_1"},
+    {"Rodrigo y Gabriela (Clear)", "bgm/rodrigo_y_gabriela"},
+    {"Saul's Theme", "bgm/sauls_theme"},
+    {"The Final Cook", "bgm/the_final_cook"}
+};
+
+const int SFX_COUNT = 12;
+const WavFile SFXS[SFX_COUNT] =
+{
+    {"Drum", "sfx/menu_drum"},
+    {"Select", "sfx/menu_select"},
+    {"Bleep", "sfx/dialogue_bleep"},
+    {"Bell", "sfx/success_bell"},
+    {"Turn", "sfx/valve_turn"},
+    {"Waltuh", "sfx/goodbye_walter"},
+    {"Pestle", "sfx/pestle"},
+    {"Crank", "sfx/crank"},
+    {"Click", "sfx/click"},
+    {"Vaccum", "sfx/vaccum"},
+    {"Acceptable", "sfx/acceptable"},
+    {"Minerals", "sfx/minerals"}
+};
 
 namespace Audio {
     // We do not read a sample at a time, that would take too long. We load in chunks.
@@ -148,7 +125,9 @@ namespace Audio {
         friend bool fillAudioStreamWav(WAV*, mm_word, u16*, mm_stream_formats);
     };
 
-    void initAudioStream();
+    static WAV* soundEffects[SFX_COUNT];
+
+    void SetupAudio();
     mm_word fillAudioStream(mm_word length, mm_addr dest, mm_stream_formats format);
     bool fillAudioStreamWav(WAV* wav, mm_word length, u16* dest, mm_stream_formats format);