thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add Resampler to music filter chain, let I_SetSongSpeed do something

Browse source
This commit is contained in:
James R 2023-08-01 19:03:37 -07:00
parent 2064dda3aa
commit b681fe226a
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/sdl/new_sound.cpp
View file

@ -17,6 +17,7 @@
#include "../audio/gain.hpp" #include "../audio/gain.hpp"
#include "../audio/mixer.hpp" #include "../audio/mixer.hpp"
#include "../audio/music_player.hpp" #include "../audio/music_player.hpp"
#include "../audio/resample.hpp"
#include "../audio/sound_chunk.hpp" #include "../audio/sound_chunk.hpp"
#include "../audio/sound_effect_player.hpp" #include "../audio/sound_effect_player.hpp"
#include "../cxxutil.hpp" #include "../cxxutil.hpp"
@ -42,6 +43,7 @@ using std::vector;
using srb2::audio::Gain; using srb2::audio::Gain;
using srb2::audio::Mixer; using srb2::audio::Mixer;
using srb2::audio::MusicPlayer; using srb2::audio::MusicPlayer;
using srb2::audio::Resampler;
using srb2::audio::Sample; using srb2::audio::Sample;
using srb2::audio::SoundChunk; using srb2::audio::SoundChunk;
using srb2::audio::SoundEffectPlayer; using srb2::audio::SoundEffectPlayer;
@ -56,6 +58,7 @@ static unique_ptr<Mixer<2>> master;
static shared_ptr<Mixer<2>> mixer_sound_effects; static shared_ptr<Mixer<2>> mixer_sound_effects;
static shared_ptr<Mixer<2>> mixer_music; static shared_ptr<Mixer<2>> mixer_music;
static shared_ptr<MusicPlayer> music_player; static shared_ptr<MusicPlayer> music_player;
static shared_ptr<Resampler<2>> resample_music_player;
static shared_ptr<Gain<2>> gain_sound_effects; static shared_ptr<Gain<2>> gain_sound_effects;
static shared_ptr<Gain<2>> gain_music_player; static shared_ptr<Gain<2>> gain_music_player;
static shared_ptr<Gain<2>> gain_music_channel; static shared_ptr<Gain<2>> gain_music_channel;
@ -187,11 +190,12 @@ void initialize_sound()
mixer_sound_effects = make_shared<Mixer<2>>(); mixer_sound_effects = make_shared<Mixer<2>>();
mixer_music = make_shared<Mixer<2>>(); mixer_music = make_shared<Mixer<2>>();
music_player = make_shared<MusicPlayer>(); music_player = make_shared<MusicPlayer>();
resample_music_player = make_shared<Resampler<2>>(music_player, 1.f);
gain_sound_effects = make_shared<Gain<2>>(); gain_sound_effects = make_shared<Gain<2>>();
gain_music_player = make_shared<Gain<2>>(); gain_music_player = make_shared<Gain<2>>();
gain_music_channel = make_shared<Gain<2>>(); gain_music_channel = make_shared<Gain<2>>();
gain_sound_effects->bind(mixer_sound_effects); gain_sound_effects->bind(mixer_sound_effects);
gain_music_player->bind(music_player); gain_music_player->bind(resample_music_player);
gain_music_channel->bind(mixer_music); gain_music_channel->bind(mixer_music);
master->add_source(gain_sound_effects); master->add_source(gain_sound_effects);
master->add_source(gain_music_channel); master->add_source(gain_music_channel);
@ -443,7 +447,12 @@ boolean I_SongPaused(void)
boolean I_SetSongSpeed(float speed) boolean I_SetSongSpeed(float speed)
{ {
(void) speed; if (resample_music_player)
{
resample_music_player->ratio(speed);
return true;
}
return false; return false;
} }