Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
SRB2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
STJr
SRB2
Commits
d47d1899
Commit
d47d1899
authored
6 years ago
by
Marco Z
Browse files
Options
Downloads
Patches
Plain Diff
Add S_MidiPlaying and S_MusicPlaying via I_MIDIPlaying and I_MusicPlaying
# Conflicts: # src/sdl12/mixer_sound.c
parent
2cf364ab
No related branches found
No related tags found
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
src/i_sound.h
+12
-0
12 additions, 0 deletions
src/i_sound.h
src/s_sound.c
+10
-0
10 additions, 0 deletions
src/s_sound.c
src/s_sound.h
+6
-0
6 additions, 0 deletions
src/s_sound.h
src/sdl/mixer_sound.c
+10
-0
10 additions, 0 deletions
src/sdl/mixer_sound.c
src/win32/win_snd.c
+10
-0
10 additions, 0 deletions
src/win32/win_snd.c
with
48 additions
and
0 deletions
src/i_sound.h
+
12
−
0
View file @
d47d1899
...
...
@@ -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
//
...
...
This diff is collapsed.
Click to expand it.
src/s_sound.c
+
10
−
0
View file @
d47d1899
...
...
@@ -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
();
}
This diff is collapsed.
Click to expand it.
src/s_sound.h
+
6
−
0
View file @
d47d1899
...
...
@@ -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
//
...
...
This diff is collapsed.
Click to expand it.
src/sdl/mixer_sound.c
+
10
−
0
View file @
d47d1899
...
...
@@ -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
//
...
...
This diff is collapsed.
Click to expand it.
src/win32/win_snd.c
+
10
−
0
View file @
d47d1899
...
...
@@ -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
)
{
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment