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
2e4c1395
Commit
2e4c1395
authored
6 years ago
by
Marco Z
Browse files
Options
Downloads
Patches
Plain Diff
DD Compile fixes
parent
2bd794c0
No related branches found
No related tags found
2 merge requests
!488
Merge in next and don't billboard papersprites in GL
,
!447
MusicPlus core: Song length, positioning, and fading features with Linedef Exec and Lua support
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/win32/win_snd.c
+5
-5
5 additions, 5 deletions
src/win32/win_snd.c
with
5 additions
and
5 deletions
src/win32/win_snd.c
+
5
−
5
View file @
2e4c1395
...
@@ -815,11 +815,11 @@ void I_SetMusicVolume(UINT8 volume)
...
@@ -815,11 +815,11 @@ void I_SetMusicVolume(UINT8 volume)
FMR_MUSIC
(
FMOD_Channel_SetVolume
(
music_channel
,
music_volume
/
31
.
0
));
FMR_MUSIC
(
FMOD_Channel_SetVolume
(
music_channel
,
music_volume
/
31
.
0
));
}
}
UINT32
I_GetSongLength
()
UINT32
I_GetSongLength
(
void
)
{
{
UINT32
length
;
if
(
I_SongType
()
==
MU_MID
)
if
(
I_SongType
()
==
MU_MID
)
return
0
;
return
0
;
UINT32
length
;
FMR_MUSIC
(
FMOD_Sound_GetLength
(
music_stream
,
&
length
,
FMOD_TIMEUNIT_MS
));
FMR_MUSIC
(
FMOD_Sound_GetLength
(
music_stream
,
&
length
,
FMOD_TIMEUNIT_MS
));
return
length
;
return
length
;
}
}
...
@@ -837,11 +837,11 @@ UINT32 I_GetSongLoopPoint(void)
...
@@ -837,11 +837,11 @@ UINT32 I_GetSongLoopPoint(void)
boolean
I_SetSongPosition
(
UINT32
position
)
boolean
I_SetSongPosition
(
UINT32
position
)
{
{
FMOD_RESULT
e
;
if
(
I_SongType
()
==
MU_MID
)
if
(
I_SongType
()
==
MU_MID
)
// Dummy out; this works for some MIDI, but not others.
// Dummy out; this works for some MIDI, but not others.
// SDL does not support this for any MIDI.
// SDL does not support this for any MIDI.
return
false
;
return
false
;
FMOD_RESULT
e
;
e
=
FMOD_Channel_SetPosition
(
music_channel
,
position
,
FMOD_TIMEUNIT_MS
);
e
=
FMOD_Channel_SetPosition
(
music_channel
,
position
,
FMOD_TIMEUNIT_MS
);
if
(
e
==
FMOD_OK
)
if
(
e
==
FMOD_OK
)
return
true
;
return
true
;
...
@@ -857,11 +857,11 @@ boolean I_SetSongPosition(UINT32 position)
...
@@ -857,11 +857,11 @@ boolean I_SetSongPosition(UINT32 position)
UINT32
I_GetSongPosition
(
void
)
UINT32
I_GetSongPosition
(
void
)
{
{
FMOD_RESULT
e
;
unsigned
int
fmposition
=
0
;
if
(
I_SongType
()
==
MU_MID
)
if
(
I_SongType
()
==
MU_MID
)
// Dummy out because unsupported, even though FMOD does this correctly.
// Dummy out because unsupported, even though FMOD does this correctly.
return
0
;
return
0
;
FMOD_RESULT
e
;
unsigned
int
fmposition
=
0
;
e
=
FMOD_Channel_GetPosition
(
music_channel
,
&
fmposition
,
FMOD_TIMEUNIT_MS
);
e
=
FMOD_Channel_GetPosition
(
music_channel
,
&
fmposition
,
FMOD_TIMEUNIT_MS
);
if
(
e
==
FMOD_OK
)
if
(
e
==
FMOD_OK
)
return
(
UINT32
)
fmposition
;
return
(
UINT32
)
fmposition
;
...
...
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