fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2024-11-10 07:21:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

hook up pause/resume

Browse source
This commit is contained in:
Eric Wasylishen 2011-01-16 22:05:57 -07:00
parent e14fc05aab
commit 2983bf5c49
3 changed files with 37 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Quake/cd_shared.c
View file

@ -159,7 +159,8 @@ void CDAudio_Pause(void)
return;
// FIXME: pause in backend
S_PauseBackgroundTrack();
wasPlaying = playing;
playing = false;
}
@ -173,7 +174,8 @@ void CDAudio_Resume(void)
return;
// FIXME: resume in backend
S_ResumeBackgroundTrack();
playing = true;
}

34
Quake/snd_dma.c
View file

@ -32,6 +32,7 @@ void S_StopAllSounds(qboolean clear);
void S_StopAllSoundsC(void);
snd_stream_t *s_backgroundStream = NULL;
static qboolean s_backgroundPaused = false;
static char s_backgroundLoop[MAX_QPATH];
@ -210,6 +211,8 @@ void S_Shutdown (void)
if (!sound_started)
return;
S_CodecShutdown();
if (shm)
shm->gamealive = 0;
sound_started = 0;
@ -956,6 +959,24 @@ void S_Update_(void)
===============================================================================
*/
/*
======================
S_PauseBackgroundTrack
======================
*/
void S_PauseBackgroundTrack( void ) {
s_backgroundPaused = true;
}
/*
======================
S_ResumeBackgroundTrack
======================
*/
void S_ResumeBackgroundTrack( void ) {
s_backgroundPaused = false;
}
/*
======================
S_StopBackgroundTrack
@ -996,6 +1017,8 @@ void S_Base_StartBackgroundTrack( const char *intro, const char *loop ){
s_backgroundLoop[MAX_QPATH-1] = '\0';
}
s_backgroundPaused = false;
// close the background track, but DON'T reset s_rawend
// if restarting the same back ground track
if(s_backgroundStream)
@ -1011,9 +1034,9 @@ void S_Base_StartBackgroundTrack( const char *intro, const char *loop ){
return;
}
if(s_backgroundStream->info.channels != 2 || s_backgroundStream->info.rate != 22050) {
Con_Printf( "WARNING: music file %s is %d channels and %d Hz\n", intro, s_backgroundStream->info.channels, s_backgroundStream->info.rate );
}
//if(s_backgroundStream->info.channels != 2 || s_backgroundStream->info.rate != 22050) {
// Con_Printf( "WARNING: music file %s is %d channels and %d Hz\n", intro, s_backgroundStream->info.channels, s_backgroundStream->info.rate );
//}
}
/*
@ -1032,11 +1055,16 @@ void S_UpdateBackgroundTrack( void ) {
return;
}
// FIXME: this means setting the music volume to 0 pauses it.. not sure if that's great
// don't bother playing anything if musicvolume is 0
if ( bgmvolume.value <= 0 ) {
return;
}
if ( s_backgroundPaused ) {
return;
}
// see how many samples should be copied into the raw buffer
if ( s_rawend[0] < soundtime ) {
s_rawend[0] = soundtime;

2
Quake/sound.h
View file

@ -140,6 +140,8 @@ void SNDDMA_BlockSound(void);
/* unblocks the output upon window focus gain */
void SNDDMA_UnblockSound(void);
void S_PauseBackgroundTrack( void );
void S_ResumeBackgroundTrack( void );
void S_Base_StopBackgroundTrack( void );
void S_Base_StartBackgroundTrack( const char *intro, const char *loop );
void S_UpdateBackgroundTrack( void );