Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-04-28 21:57:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Add a fix to load the music from save

Browse source 
This commit implements code to get/set sample offset in an OpenAL channel and saves the music filename/offset into the file. This only works by using the experimental sound system, so it partially fixes #327
This commit is contained in:
smallmodel 2024-07-22 20:07:32 +02:00
parent 2198bdec21
commit 757b4849f8
No known key found for this signature in database
GPG key ID: 9F2D623CEDF08512
9 changed files with 151 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

14
code/client/cl_ui.cpp
View file

@ -3976,13 +3976,13 @@ void S_ServerLoaded(void)
Com_DPrintf("Loading Previous Sound State.\n");
S_StopAllSounds2(qfalse);
//S_TriggeredMusic_Stop();
//s_bSoundPaused = qtrue;
//S_ReLoad( &svs.soundSystem );
//
//if( svs.tm_filename[ 0 ] ) {
// S_TriggeredMusic_SetupHandle( svs.tm_filename, svs.tm_loopcount, svs.tm_offset, 0 );
//}
S_TriggeredMusic_Stop();
s_bSoundPaused = qtrue;
S_ReLoad( &svs.soundSystem );
if( svs.tm_filename[ 0 ] ) {
S_TriggeredMusic_SetupHandle( svs.tm_filename, svs.tm_loopcount, svs.tm_offset, 0 );
}
}
/*

30
code/client/new/snd_main_new.cpp
View file

@ -503,6 +503,36 @@ void S_TriggeredMusic_SetupHandle(const char* pszName, int iLoopCount, int iOffs
// FIXME: unimplemented
}
/*
==============
S_GetMusicFilename
==============
*/
const char* S_GetMusicFilename() {
// FIXME: unimplemented
return "";
}
/*
==============
S_GetMusicLoopCount
==============
*/
int S_GetMusicLoopCount() {
// FIXME: unimplemented
return 0;
}
/*
==============
S_GetMusicOffset
==============
*/
unsigned int S_GetMusicOffset() {
// FIXME: unimplemented
return 0;
}
/*
==============
callbackServer

4
code/client/new/snd_public_new.h
View file

@ -80,6 +80,10 @@ void S_FadeSound(float fTime);
void S_TriggeredMusic_PlayIntroMusic();
void S_TriggeredMusic_SetupHandle(const char* pszName, int iLoopCount, int iOffset, qboolean autostart);
const char* S_GetMusicFilename();
int S_GetMusicLoopCount();
unsigned int S_GetMusicOffset();
#ifdef __cplusplus
}
#endif

30
code/client/snd_dma_new.cpp
View file

@ -787,4 +787,34 @@ void S_ClearSoundBuffer()
// TODO: Remove once AL is fully implemented
}
/*
==============
S_GetMusicFilename
==============
*/
const char* S_GetMusicFilename()
{
return S_Driver_GetMusicFilename();
}
/*
==============
S_GetMusicLoopCount
==============
*/
int S_GetMusicLoopCount()
{
return S_Driver_GetMusicLoopCount();
}
/*
==============
S_GetMusicOffset
==============
*/
unsigned int S_GetMusicOffset()
{
return S_Driver_GetMusicOffset();
}
#endif

3
code/client/snd_local_new.h
View file

@ -215,6 +215,9 @@ qboolean S_LoadSound(const char *fileName, sfx_t *sfx, int streamed, qboolean fo
#define S_Driver_Respatialize S_Call_SndDriverX(SOUND_DRIVER, Respatialize)
#define S_Driver_SetReverb S_Call_SndDriverX(SOUND_DRIVER, SetReverb)
#define S_Driver_Update S_Call_SndDriverX(SOUND_DRIVER, Update)
#define S_Driver_GetMusicFilename S_Call_SndDriverX(SOUND_DRIVER, GetMusicFilename)
#define S_Driver_GetMusicLoopCount S_Call_SndDriverX(SOUND_DRIVER, GetMusicLoopCount)
#define S_Driver_GetMusicOffset S_Call_SndDriverX(SOUND_DRIVER, GetMusicOffset)
void S_PrintInfo();
void S_DumpInfo();

65
code/client/snd_openal_new.cpp
View file

@ -958,8 +958,6 @@ void S_UnpauseSound()
return;
}
s_bSoundPaused = true;
for (i = 0; i < MAX_OPENAL_POSITION_CHANNELS; i++) {
openal_channel *pChannel = openal.channel[i];
if (!pChannel) {
@ -2477,6 +2475,36 @@ void S_OPENAL_Update()
}
}
/*
==============
S_OPENAL_GetMusicFilename
==============
*/
const char* S_OPENAL_GetMusicFilename()
{
return openal.tm_filename;
}
/*
==============
S_OPENAL_GetMusicLoopCount
==============
*/
int S_OPENAL_GetMusicLoopCount()
{
return openal.tm_loopcount;
}
/*
==============
S_OPENAL_GetMusicOffset
==============
*/
unsigned int S_OPENAL_GetMusicOffset()
{
return openal.chan_trig_music.sample_offset();
}
/*
==============
S_IsSoundPlaying
@ -3077,8 +3105,12 @@ openal_channel::sample_offset
*/
U32 openal_channel::sample_offset()
{
STUB_DESC("sample_offset");
return 127;
ALint offset = 0;
qalGetSourcei(source, AL_SAMPLE_OFFSET, &offset);
alDieIfError();
return offset;
}
/*
@ -3088,8 +3120,12 @@ openal_channel::sample_ms_offset
*/
U32 openal_channel::sample_ms_offset()
{
STUB_DESC("sample_ms_offset");
return 127;
float offset = 0;
qalGetSourcef(source, AL_SAMPLE_OFFSET, &offset);
alDieIfError();
return offset * 1000.f;
}
/*
@ -3122,7 +3158,8 @@ openal_channel::set_sample_offset
*/
void openal_channel::set_sample_offset(U32 offset)
{
STUB_DESC("sample_offset");
qalSourcei(source, AL_SAMPLE_OFFSET, offset);
alDieIfError();
}
/*
@ -3132,7 +3169,8 @@ openal_channel::set_sample_ms_offset
*/
void openal_channel::set_sample_ms_offset(U32 offset)
{
STUB_DESC("sample_ms_offset");
qalSourcef(source, AL_SEC_OFFSET, offset / 1000.f);
alDieIfError();
}
/*
@ -3932,9 +3970,18 @@ void S_TriggeredMusic_SetupHandle(const char *pszName, int iLoopCount, int iOffs
openal.chan_trig_music.set_sample_loop_count(iLoopCount);
openal.chan_trig_music.set_sample_offset(iOffset);
if (autostart) {
// Fixed in OPM
// Play the sound then pause it immediately
// So it can be unpaused upon loading from save
openal.chan_trig_music.play();
if (!autostart) {
openal.chan_trig_music.pause();
}
//if (autostart) {
// openal.chan_trig_music.play();
//}
}
/*

4
code/client/snd_openal_new.h
View file

@ -197,6 +197,10 @@ void S_OPENAL_Respatialize(int iEntNum, const vec3_t vHeadPos, const vec3_t vAxi
void S_OPENAL_SetReverb(int iType, float fLevel);
void S_OPENAL_Update();
const char* S_OPENAL_GetMusicFilename();
int S_OPENAL_GetMusicLoopCount();
unsigned int S_OPENAL_GetMusicOffset();
#ifdef __cplusplus
}
#endif

4
code/client/snd_public.h
View file

@ -157,6 +157,10 @@ void S_StopMovieAudio();
void S_SetupMovieAudio(const char* pszMovieName);
int S_CurrentMoviePosition();
const char* S_GetMusicFilename();
int S_GetMusicLoopCount();
unsigned int S_GetMusicOffset();
#ifdef __cplusplus
}
#endif

12
code/server/sv_ccmds.c
View file

@ -1955,6 +1955,7 @@ qboolean SV_ArchiveServerFile( qboolean loading, qboolean autosave )
time_t aclock;
Com_DPrintf( "SV_ArchiveServerFile(%s)\n", autosave ? "true" : "false" );
memset(&save, 0, sizeof(save));
name = Com_GetArchiveFileName( svs.gameName, "ssv" );
if( !loading )
@ -1995,6 +1996,17 @@ qboolean SV_ArchiveServerFile( qboolean loading, qboolean autosave )
strncpy( save.saveName, svs.gameName, sizeof( save.saveName ) );
save.mapTime = svs.time - svs.startTime;
name = S_GetMusicFilename();
if (name) {
Q_strncpyz(save.tm_filename, name, sizeof(save.tm_filename));
save.tm_offset = S_GetMusicOffset();
save.tm_loopcount = S_GetMusicLoopCount();
} else {
save.tm_filename[0] = 0;
save.tm_offset = 0;
save.tm_loopcount = 0;
}
FS_Write( &save, sizeof( savegamestruct_t ), f );
S_Save( f );
CM_WritePortalState( f );