mirror/UnleashedRecomp
1
0
Fork 0
mirror of https://github.com/hedge-dev/UnleashedRecomp synced 2026-07-29 07:34:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Implement installer music. (#463)

Browse Source
This commit is contained in:
Skyth (Asilkan)
2025-02-25 23:00:51 +03:00
committed by GitHub
parent 98daa27c14
commit 0128377ad9
6 changed files with 52 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UnleashedRecomp/apu/embedded_player.cpp
+24 -1
View File
@@ -2,6 +2,7 @@
#include <apu/embedded_player.h>
#include <user/config.h>
#include <res/music/installer.ogg.h>
#include <res/sounds/sys_worldmap_cursor.ogg.h>
#include <res/sounds/sys_worldmap_finaldecide.ogg.h>
#include <res/sounds/sys_actstg_pausecansel.ogg.h>
@@ -87,13 +88,17 @@ static void PlayEmbeddedSound(EmbeddedSound s)
data.chunk = Mix_LoadWAV_RW(SDL_RWFromConstMem(soundData, soundDataSize), 1);
}
Mix_VolumeChunk(data.chunk, Config::MasterVolume * Config::EffectsVolume * MIX_MAX_VOLUME);
Mix_PlayChannel(g_channelIndex % MIX_CHANNELS, data.chunk, 0);
++g_channelIndex;
}
static Mix_Music* g_installerMusic;
void EmbeddedPlayer::Init()
{
Mix_OpenAudio(XAUDIO_SAMPLES_HZ, AUDIO_F32SYS, 2, 256);
Mix_OpenAudio(XAUDIO_SAMPLES_HZ, AUDIO_F32SYS, 2, 2048);
g_installerMusic = Mix_LoadMUS_RW(SDL_RWFromConstMem(g_installer_music, sizeof(g_installer_music)), 1);
s_isActive = true;
}
@@ -111,6 +116,21 @@ void EmbeddedPlayer::Play(const char *name)
PlayEmbeddedSound(it->second);
}
void EmbeddedPlayer::PlayMusic()
{
if (!Mix_PlayingMusic())
{
Mix_PlayMusic(g_installerMusic, INT_MAX);
Mix_VolumeMusic(Config::MasterVolume * Config::MusicVolume * MUSIC_VOLUME * MIX_MAX_VOLUME);
}
}
void EmbeddedPlayer::FadeOutMusic()
{
if (Mix_PlayingMusic())
Mix_FadeOutMusic(1000);
}
void EmbeddedPlayer::Shutdown()
{
for (EmbeddedSoundData &data : g_embeddedSoundData)
@@ -119,6 +139,9 @@ void EmbeddedPlayer::Shutdown()
Mix_FreeChunk(data.chunk);
}
Mix_HaltMusic();
Mix_FreeMusic(g_installerMusic);
Mix_CloseAudio();
Mix_Quit();
UnleashedRecomp/apu/embedded_player.h
+6 -1
View File
@@ -2,9 +2,14 @@
struct EmbeddedPlayer
{
inline static bool s_isActive = false;
// Arbitrarily picked volume to match the mixing in the original game.
static constexpr float MUSIC_VOLUME = 0.25f;
static inline bool s_isActive = false;
static void Init();
static void Play(const char *name);
static void PlayMusic();
static void FadeOutMusic();
static void Shutdown();
};