lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Interface name refactor: Music -> Song other targets

This commit is contained in:
mazmazz 2018-08-21 06:22:42 -04:00
parent a1b1391e24
commit 506db1e303
5 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/android/i_sound.c
View File

@ -74,17 +74,17 @@ void I_ResumeSong(INT32 handle)
(void)handle; (void)handle;
} }
boolean I_MusicPlaying(void) boolean I_SongPlaying(void)
{ {
return false; return false;
} }
boolean I_MusicPaused(void) boolean I_SongPaused(void)
{ {
return false; return false;
} }
musictype_t I_MusicType(void) musictype_t I_GetSongType(void)
{ {
return MU_NONE; return MU_NONE;
} }
@ -158,29 +158,29 @@ boolean I_SetSongSpeed(float speed)
return false; return false;
} }
UINT32 I_GetMusicLength(void) UINT32 I_GetSongLength(void)
{ {
return 0; return 0;
} }
boolean I_SetMusicLoopPoint(UINT32 looppoint) boolean I_SetSongLoopPoint(UINT32 looppoint)
{ {
(void)looppoint; (void)looppoint;
return false; return false;
} }
UINT32 I_GetMusicLoopPoint(void) UINT32 I_GetSongLoopPoint(void)
{ {
return 0; return 0;
} }
boolean I_SetMusicPosition(UINT32 position) boolean I_SetSongPosition(UINT32 position)
{ {
(void)position; (void)position;
return false; return false;
} }
UINT32 I_GetMusicPosition(void) UINT32 I_GetSongPosition(void)
{ {
return 0; return 0;
} }
@ -190,11 +190,11 @@ void I_SetInternalMusicVolume(UINT8 volume)
(void)volume; (void)volume;
} }
void I_StopFadingMusic(void) void I_StopFadingSong(void)
{ {
} }
boolean I_FadeMusicFromLevel(UINT8 target_volume, UINT8 source_volume, UINT32 ms, boolean stopafterfade) boolean I_FadeSongFromLevel(UINT8 target_volume, UINT8 source_volume, UINT32 ms, boolean stopafterfade)
{ {
(void)target_volume; (void)target_volume;
(void)source_volume; (void)source_volume;
@ -202,14 +202,14 @@ boolean I_FadeMusicFromLevel(UINT8 target_volume, UINT8 source_volume, UINT32 ms
return false; return false;
} }
boolean I_FadeMusic(UINT8 target_volume, UINT32 ms) boolean I_FadeSong(UINT8 target_volume, UINT32 ms)
{ {
(void)target_volume; (void)target_volume;
(void)ms; (void)ms;
return false; return false;
} }
boolean I_FadeOutStopMusic(UINT32 ms) boolean I_FadeOutStopSong(UINT32 ms)
{ {
(void)ms; (void)ms;
return false; return false;

24
src/djgppdos/i_sound.c
View File

@ -551,44 +551,44 @@ boolean I_SetSongSpeed(float speed)
return false; return false;
} }
UINT32 I_GetMusicLength(void) UINT32 I_GetSongLength(void)
{ {
return 0; return 0;
} }
boolean I_SetMusicLoopPoint(UINT32 looppoint) boolean I_SetSongLoopPoint(UINT32 looppoint)
{ {
(void)looppoint; (void)looppoint;
return false; return false;
} }
UINT32 I_GetMusicLoopPoint(void) UINT32 I_GetSongLoopPoint(void)
{ {
return 0; return 0;
} }
boolean I_SetMusicPosition(UINT32 position) boolean I_SetSongPosition(UINT32 position)
{ {
(void)position; (void)position;
return false; return false;
} }
UINT32 I_GetMusicPosition(void) UINT32 I_GetSongPosition(void)
{ {
return 0; return 0;
} }
boolean I_MusicPlaying(void) boolean I_SongPlaying(void)
{ {
return (boolean)currsong && music_started; return (boolean)currsong && music_started;
} }
boolean I_MusicPaused(void) boolean I_SongPaused(void)
{ {
return false; return false;
} }
musictype_t I_MusicType(void) musictype_t I_GetSongType(void)
{ {
return MU_NONE; return MU_NONE;
} }
@ -598,11 +598,11 @@ void I_SetInternalMusicVolume(UINT8 volume)
(void)volume; (void)volume;
} }
void I_StopFadingMusic(void) void I_StopFadingSong(void)
{ {
} }
boolean I_FadeMusicFromLevel(UINT8 target_volume, UINT8 source_volume, UINT32 ms, boolean stopafterfade) boolean I_FadeSongFromLevel(UINT8 target_volume, UINT8 source_volume, UINT32 ms, boolean stopafterfade)
{ {
(void)target_volume; (void)target_volume;
(void)source_volume; (void)source_volume;
@ -610,14 +610,14 @@ boolean I_FadeMusicFromLevel(UINT8 target_volume, UINT8 source_volume, UINT32 ms
return false; return false;
} }
boolean I_FadeMusic(UINT8 target_volume, UINT32 ms) boolean I_FadeSong(UINT8 target_volume, UINT32 ms)
{ {
(void)target_volume; (void)target_volume;
(void)ms; (void)ms;
return false; return false;
} }
boolean I_FadeOutStopMusic(UINT32 ms) boolean I_FadeOutStopSong(UINT32 ms)
{ {
(void)ms; (void)ms;
return false; return false;

24
src/dummy/i_sound.c
View File

@ -151,11 +151,11 @@ void I_SetInternalMusicVolume(UINT8 volume)
(void)volume; (void)volume;
} }
void I_StopFadingMusic(void) void I_StopFadingSong(void)
{ {
} }
boolean I_FadeMusicFromLevel(UINT8 target_volume, UINT8 source_volume, UINT32 ms, boolean stopafterfade) boolean I_FadeSongFromLevel(UINT8 target_volume, UINT8 source_volume, UINT32 ms, boolean stopafterfade)
{ {
(void)target_volume; (void)target_volume;
(void)source_volume; (void)source_volume;
@ -163,14 +163,14 @@ boolean I_FadeMusicFromLevel(UINT8 target_volume, UINT8 source_volume, UINT32 ms
return false; return false;
} }
boolean I_FadeMusic(UINT8 target_volume, UINT32 ms) boolean I_FadeSong(UINT8 target_volume, UINT32 ms)
{ {
(void)target_volume; (void)target_volume;
(void)ms; (void)ms;
return false; return false;
} }
boolean I_FadeOutStopMusic(UINT32 ms) boolean I_FadeOutStopSong(UINT32 ms)
{ {
(void)ms; (void)ms;
return false; return false;
@ -184,44 +184,44 @@ boolean I_FadeInStartDigSong(const char *musicname, UINT16 track, boolean loopin
return false; return false;
} }
UINT32 I_GetMusicLength(void) UINT32 I_GetSongLength(void)
{ {
return 0; return 0;
} }
boolean I_SetMusicLoopPoint(UINT32 looppoint) boolean I_SetSongLoopPoint(UINT32 looppoint)
{ {
(void)looppoint; (void)looppoint;
return false; return false;
} }
UINT32 I_GetMusicLoopPoint(void) UINT32 I_GetSongLoopPoint(void)
{ {
return 0; return 0;
} }
boolean I_SetMusicPosition(UINT32 position) boolean I_SetSongPosition(UINT32 position)
{ {
(void)position; (void)position;
return false; return false;
} }
UINT32 I_GetMusicPosition(void) UINT32 I_GetSongPosition(void)
{ {
return 0; return 0;
} }
boolean I_MusicPlaying(void) boolean I_SongPlaying(void)
{ {
return false; return false;
} }
boolean I_MusicPaused(void) boolean I_SongPaused(void)
{ {
return false; return false;
} }
musictype_t I_MusicType(void) musictype_t I_GetSongType(void)
{ {
return MU_NONE; return MU_NONE;
} }

24
src/sdl/sdl_sound.c
View File

@ -1649,17 +1649,17 @@ void I_StopSong(INT32 handle)
#endif #endif
} }
boolean I_MusicPlaying(void) boolean I_SongPlaying(void)
{ {
return musicStarted; return musicStarted;
} }
boolean I_MusicPaused(void) boolean I_SongPaused(void)
{ {
return Mix_PausedMusic(); return Mix_PausedMusic();
} }
musictype_t I_MusicType(void) musictype_t I_GetSongType(void)
{ {
return MU_NONE; return MU_NONE;
} }
@ -1989,29 +1989,29 @@ boolean I_SetSongSpeed(float speed)
return false; return false;
} }
UINT32 I_GetMusicLength(void) UINT32 I_GetSongLength(void)
{ {
return 0; return 0;
} }
boolean I_SetMusicLoopPoint(UINT32 looppoint) boolean I_SetSongLoopPoint(UINT32 looppoint)
{ {
(void)looppoint; (void)looppoint;
return false; return false;
} }
UINT32 I_GetMusicLoopPoint(void) UINT32 I_GetSongLoopPoint(void)
{ {
return 0; return 0;
} }
boolean I_SetMusicPosition(UINT32 position) boolean I_SetSongPosition(UINT32 position)
{ {
(void)position; (void)position;
return false; return false;
} }
UINT32 I_GetMusicPosition(void) UINT32 I_GetSongPosition(void)
{ {
return 0; return 0;
} }
@ -2027,11 +2027,11 @@ void I_SetInternalMusicVolume(UINT8 volume)
(void)volume; (void)volume;
} }
void I_StopFadingMusic(void) void I_StopFadingSong(void)
{ {
} }
boolean I_FadeMusicFromLevel(UINT8 target_volume, UINT8 source_volume, UINT32 ms, boolean stopafterfade) boolean I_FadeSongFromLevel(UINT8 target_volume, UINT8 source_volume, UINT32 ms, boolean stopafterfade)
{ {
(void)target_volume; (void)target_volume;
(void)source_volume; (void)source_volume;
@ -2039,14 +2039,14 @@ boolean I_FadeMusicFromLevel(UINT8 target_volume, UINT8 source_volume, UINT32 ms
return false; return false;
} }
boolean I_FadeMusic(UINT8 target_volume, UINT32 ms) boolean I_FadeSong(UINT8 target_volume, UINT32 ms)
{ {
(void)target_volume; (void)target_volume;
(void)ms; (void)ms;
return false; return false;
} }
boolean I_FadeOutStopMusic(UINT32 ms) boolean I_FadeOutStopSong(UINT32 ms)
{ {
(void)ms; (void)ms;
return false; return false;

24
src/win32/win_snd.c
View File

@ -468,12 +468,12 @@ void I_ResumeSong(INT32 handle)
FMR_MUSIC(FMOD_Channel_SetPaused(music_channel, false)); FMR_MUSIC(FMOD_Channel_SetPaused(music_channel, false));
} }
boolean I_MusicPlaying(void) boolean I_SongPlaying(void)
{ {
return (boolean)music_stream; return (boolean)music_stream;
} }
boolean I_MusicPaused(void) boolean I_SongPaused(void)
{ {
boolean fmpaused = false; boolean fmpaused = false;
if (music_stream) if (music_stream)
@ -481,7 +481,7 @@ boolean I_MusicPaused(void)
return fmpaused; return fmpaused;
} }
musictype_t I_MusicType(void) musictype_t I_GetSongType(void)
{ {
return MU_NONE; return MU_NONE;
} }
@ -774,7 +774,7 @@ boolean I_SetSongSpeed(float speed)
return true; return true;
} }
UINT32 I_GetMusicLength() UINT32 I_GetSongLength()
{ {
if (midimode) if (midimode)
return 0; return 0;
@ -783,18 +783,18 @@ UINT32 I_GetMusicLength()
return length; return length;
} }
boolean I_SetMusicLoopPoint(UINT32 looppoint) boolean I_SetSongLoopPoint(UINT32 looppoint)
{ {
(void)looppoint; (void)looppoint;
return false; return false;
} }
UINT32 I_GetMusicLoopPoint(void) UINT32 I_GetSongLoopPoint(void)
{ {
return 0; return 0;
} }
boolean I_SetMusicPosition(UINT32 position) boolean I_SetSongPosition(UINT32 position)
{ {
if(midimode) if(midimode)
// Dummy out; this works for some MIDI, but not others. // Dummy out; this works for some MIDI, but not others.
@ -814,7 +814,7 @@ boolean I_SetMusicPosition(UINT32 position)
} }
} }
UINT32 I_GetMusicPosition(void) UINT32 I_GetSongPosition(void)
{ {
if(midimode) if(midimode)
// Dummy out because unsupported, even though FMOD does this correctly. // Dummy out because unsupported, even though FMOD does this correctly.
@ -878,11 +878,11 @@ void I_SetInternalMusicVolume(UINT8 volume)
(void)volume; (void)volume;
} }
void I_StopFadingMusic(void) void I_StopFadingSong(void)
{ {
} }
boolean I_FadeMusicFromLevel(UINT8 target_volume, UINT8 source_volume, UINT32 ms, boolean stopafterfade) boolean I_FadeSongFromLevel(UINT8 target_volume, UINT8 source_volume, UINT32 ms, boolean stopafterfade)
{ {
(void)target_volume; (void)target_volume;
(void)source_volume; (void)source_volume;
@ -890,14 +890,14 @@ boolean I_FadeMusicFromLevel(UINT8 target_volume, UINT8 source_volume, UINT32 ms
return false; return false;
} }
boolean I_FadeMusic(UINT8 target_volume, UINT32 ms) boolean I_FadeSong(UINT8 target_volume, UINT32 ms)
{ {
(void)target_volume; (void)target_volume;
(void)ms; (void)ms;
return false; return false;
} }
boolean I_FadeOutStopMusic(UINT32 ms) boolean I_FadeOutStopSong(UINT32 ms)
{ {
(void)ms; (void)ms;
return false; return false;