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
Snippets
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Ors
SRB2
Commits
5708325d
Commit
5708325d
authored
4 years ago
by
SteelT
Browse files
Options
Downloads
Patches
Plain Diff
Use SAMPLERATE for consistency with the rest of the code
parent
f626b9f4
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/sdl/mixer_sound.c
+4
-4
4 additions, 4 deletions
src/sdl/mixer_sound.c
with
4 additions
and
4 deletions
src/sdl/mixer_sound.c
+
4
−
4
View file @
5708325d
...
...
@@ -497,7 +497,7 @@ void *I_GetSfx(sfxinfo_t *sfx)
zErr
=
inflate
(
&
stream
,
Z_FINISH
);
if
(
zErr
==
Z_STREAM_END
)
{
// Run GME on new data
if
(
!
gme_open_data
(
inflatedData
,
inflatedLen
,
&
emu
,
44100
))
if
(
!
gme_open_data
(
inflatedData
,
inflatedLen
,
&
emu
,
SAMPLERATE
))
{
short
*
mem
;
UINT32
len
;
...
...
@@ -531,7 +531,7 @@ void *I_GetSfx(sfxinfo_t *sfx)
#endif
}
// Try to read it as a GME sound
else
if
(
!
gme_open_data
(
lump
,
sfx
->
length
,
&
emu
,
44100
))
else
if
(
!
gme_open_data
(
lump
,
sfx
->
length
,
&
emu
,
SAMPLERATE
))
{
short
*
mem
;
UINT32
len
;
...
...
@@ -1160,7 +1160,7 @@ boolean I_LoadSong(char *data, size_t len)
if
(
zErr
==
Z_STREAM_END
)
{
// Run GME on new data
if
(
!
gme_open_data
(
inflatedData
,
inflatedLen
,
&
gme
,
44100
))
if
(
!
gme_open_data
(
inflatedData
,
inflatedLen
,
&
gme
,
SAMPLERATE
))
{
Z_Free
(
inflatedData
);
// GME supposedly makes a copy for itself, so we don't need this lying around
return
true
;
...
...
@@ -1179,7 +1179,7 @@ boolean I_LoadSong(char *data, size_t len)
return
false
;
#endif
}
else
if
(
!
gme_open_data
(
data
,
len
,
&
gme
,
44100
))
else
if
(
!
gme_open_data
(
data
,
len
,
&
gme
,
SAMPLERATE
))
return
true
;
#endif
...
...
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