thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-04 15:12:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Hey it's audio- ....resynching...

Browse source
This commit is contained in:
James R 2019-11-27 19:53:46 -08:00
parent 36f9bb4381
commit 530cac8673
4 changed files with 53 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/i_sound.h
View file

@ -158,6 +158,8 @@ UINT32 I_GetSongLoopPoint(void);
boolean I_SetSongPosition(UINT32 position);
UINT32 I_GetSongPosition(void);
void I_UpdateSongLagThreshold (void);
/// ------------------------
// MUSIC PLAYBACK
/// ------------------------

4
src/s_sound.c
View file

@ -120,6 +120,8 @@ consvar_t cv_gamesounds = {"sounds", "On", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff,
consvar_t cv_playmusicifunfocused = {"playmusicifunfocused", "No", CV_SAVE|CV_CALL|CV_NOINIT, CV_YesNo, PlayMusicIfUnfocused_OnChange, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_playsoundifunfocused = {"playsoundsifunfocused", "No", CV_SAVE|CV_CALL|CV_NOINIT, CV_YesNo, PlaySoundIfUnfocused_OnChange, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_music_resync_threshold = {"music_resync_threshold", "100", CV_SAVE|CV_CALL, CV_Unsigned, I_UpdateSongLagThreshold};
#define S_MAX_VOLUME 127
// when to clip out sounds
@ -283,6 +285,8 @@ void S_RegisterSoundStuff(void)
CV_RegisterVar(&cv_playmusicifunfocused);
CV_RegisterVar(&cv_playsoundifunfocused);
CV_RegisterVar(&cv_music_resync_threshold);
COM_AddCommand("tunes", Command_Tunes_f);
COM_AddCommand("restartaudio", Command_RestartAudio_f);

2
src/s_sound.h
View file

@ -36,6 +36,8 @@ extern consvar_t cv_gamesounds;
extern consvar_t cv_playmusicifunfocused;
extern consvar_t cv_playsoundifunfocused;
extern consvar_t cv_music_resync_threshold;
#ifdef SNDSERV
extern consvar_t sndserver_cmd, sndserver_arg;
#endif

45
src/sdl/mixer_sound.c
View file

@ -13,6 +13,12 @@
#if defined(HAVE_SDL) && defined(HAVE_MIXER) && SOUND==SOUND_MIXER
/*
Just for hu_stopped. I promise I didn't
write netcode into the sound code, OKAY?
*/
#include "../d_clisrv.h"
#include "../sounds.h"
#include "../s_sound.h"
#include "../i_sound.h"
@ -74,12 +80,16 @@
UINT8 sound_started = false;
static UINT32 stutter_threshold;
static Mix_Music *music;
static UINT8 music_volume, sfx_volume, internal_volume;
static float loop_point;
static float song_length; // length in seconds
static boolean songpaused;
static UINT32 music_end_bytes;
static UINT32 music_bytes;
static UINT32 music_stutter_bytes;
static boolean is_looping;
// fading
@ -101,6 +111,8 @@ static void var_cleanup(void)
loop_point = song_length =\
music_bytes = fading_source = fading_target =\
fading_timer = fading_duration = 0;
music_end_bytes = 0;
music_stutter_bytes = 0;
songpaused = is_looping =\
is_fading = false;
@ -554,6 +566,8 @@ static void do_fading_callback(void)
static void count_music_bytes(int chan, void *stream, int len, void *udata)
{
UINT32 bytes;
(void)chan;
(void)stream;
(void)udata;
@ -561,12 +575,35 @@ static void count_music_bytes(int chan, void *stream, int len, void *udata)
if (!music || I_SongType() == MU_GME || I_SongType() == MU_MOD || I_SongType() == MU_MID)
return;
music_bytes += len;
if (hu_stopped)
{
music_stutter_bytes += len;
}
else
{
if (music_stutter_bytes >= stutter_threshold)
{
/*
This would be after looping. If we're too near to the start of the
file, subtracting the delta will just underflow.
*/
if (music_stutter_bytes > music_bytes)
{
/* We already know where the end is because we looped. */
bytes = ( music_end_bytes - ( music_stutter_bytes - music_bytes ));
}
else
bytes = ( music_bytes - music_stutter_bytes );
I_SetSongPosition((int)( bytes/4/44100.0*1000 ));
}
}
}
static void music_loop(void)
{
if (is_looping)
{
music_end_bytes = music_bytes;
Mix_PlayMusic(music, 0);
Mix_SetMusicPosition(loop_point);
music_bytes = loop_point*44100.0L*4; //assume 44.1khz, 4-byte length (see I_GetSongPosition)
@ -848,6 +885,8 @@ boolean I_SetSongPosition(UINT32 position)
// NOT if position input is greater than song length.
music_bytes = 0;
music_stutter_bytes = 0;
return true;
}
}
@ -892,6 +931,12 @@ UINT32 I_GetSongPosition(void)
// 8M: 1 | 8S: 2 | 16M: 2 | 16S: 4
}
void
I_UpdateSongLagThreshold (void)
{
stutter_threshold = cv_music_resync_threshold.value/1000.0*(4*44100);
}
/// ------------------------
/// Music Playback
/// ------------------------