Add S_MidiPlaying and S_MusicPlaying via I_MIDIPlaying and I_MusicPlaying

# Conflicts:
#	src/sdl12/mixer_sound.c
This commit is contained in:
mazmazz 2018-08-15 01:43:16 -04:00
parent 2cf364ab8b
commit d47d18998b
5 changed files with 48 additions and 0 deletions

View file

@ -132,6 +132,18 @@ void I_PauseSong(INT32 handle);
*/
void I_ResumeSong(INT32 handle);
/** \brief Get MIDI music status
\return boolean
*/
boolean I_MIDIPlaying(void);
/** \brief Get general music status
\return boolean
*/
boolean I_MusicPlaying(void);
//
// MIDI I/O
//

View file

@ -1575,3 +1575,13 @@ void S_ResumeAudio(void)
// resume cd music
I_ResumeCD();
}
boolean S_MIDIPlaying(void)
{
return I_MIDIPlaying();
}
boolean S_MusicPlaying(void)
{
return I_MusicPlaying();
}

View file

@ -148,6 +148,12 @@ void S_StopMusic(void);
void S_PauseAudio(void);
void S_ResumeAudio(void);
// Gets MIDI music status
boolean S_MIDIPlaying(void);
// Gets general music status
boolean S_MusicPlaying(void);
//
// Updates music & sounds
//

View file

@ -497,6 +497,16 @@ void I_ResumeSong(INT32 handle)
songpaused = false;
}
boolean I_MIDIPlaying(void)
{
return midimode && music;
}
boolean I_MusicPlaying(void)
{
return (boolean)music;
}
//
// Digital Music
//

View file

@ -468,6 +468,16 @@ void I_ResumeSong(INT32 handle)
FMR_MUSIC(FMOD_Channel_SetPaused(music_channel, false));
}
boolean I_MIDIPlaying(void)
{
return midimode && music_stream;
}
boolean I_MusicPlaying(void)
{
return (boolean)music_stream;
}
void I_InitDigMusic(void)
{
}