From 47423a69ed80bbad87d0a2fce03689efdb0a3a77 Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Wed, 15 Aug 2018 02:10:46 -0400
Subject: [PATCH] Refactor to SetMusicPosition, GetMusicPosition
# Conflicts:
# src/lua_baselib.c
# src/nds/i_sound.c
# src/sdl12/mixer_sound.c
# src/sdl12/sdl_sound.c
# src/win32ce/win_snd.c
---
src/android/i_sound.c | 4 ++--
src/d_netcmd.c | 2 +-
src/djgppdos/i_sound.c | 4 ++--
src/dummy/i_sound.c | 4 ++--
src/i_sound.h | 4 ++--
src/lua_baselib.c | 12 ++++++------
src/s_sound.c | 8 ++++----
src/s_sound.h | 4 ++--
src/sdl/mixer_sound.c | 6 +++---
src/sdl/sdl_sound.c | 4 ++--
src/win32/win_snd.c | 4 ++--
11 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/src/android/i_sound.c b/src/android/i_sound.c
index 36281cd0d..fa9e326c0 100644
--- a/src/android/i_sound.c
+++ b/src/android/i_sound.c
@@ -158,13 +158,13 @@ boolean I_SetSongSpeed(float speed)
return false;
}
-boolean I_SetSongPosition(UINT32 position)
+boolean I_SetMusicPosition(UINT32 position)
{
(void)position;
return false;
}
-UINT32 I_GetSongPosition(void)
+UINT32 I_GetMusicPosition(void)
{
return 0;
}
diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index f72c6bf51..27e8dfd70 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -4045,7 +4045,7 @@ static void Command_Tunes_f(void)
if (argc > 4)
{
UINT32 position = (UINT32)atoi(COM_Argv(4));
- S_PositionMusic(position);
+ S_SetMusicPosition(position);
}
}
diff --git a/src/djgppdos/i_sound.c b/src/djgppdos/i_sound.c
index d21eab18f..4a1afa301 100644
--- a/src/djgppdos/i_sound.c
+++ b/src/djgppdos/i_sound.c
@@ -551,13 +551,13 @@ boolean I_SetSongSpeed(float speed)
return false;
}
-boolean I_SetSongPosition(UINT32 position)
+boolean I_SetMusicPosition(UINT32 position)
{
(void)position;
return false;
}
-UINT32 I_GetSongPosition(void)
+UINT32 I_GetMusicPosition(void)
{
return 0.;
}
diff --git a/src/dummy/i_sound.c b/src/dummy/i_sound.c
index ba1d98084..26d782709 100644
--- a/src/dummy/i_sound.c
+++ b/src/dummy/i_sound.c
@@ -146,13 +146,13 @@ boolean I_SetSongTrack(int track)
return false;
}
-boolean I_SetSongPosition(UINT32 position)
+boolean I_SetMusicPosition(UINT32 position)
{
(void)position;
return false;
}
-UINT32 I_GetSongPosition(void)
+UINT32 I_GetMusicPosition(void)
{
return 0;
}
diff --git a/src/i_sound.h b/src/i_sound.h
index 248da3d82..ff9a9f196 100644
--- a/src/i_sound.h
+++ b/src/i_sound.h
@@ -224,9 +224,9 @@ void I_ShutdownDigMusic(void);
boolean I_SetSongSpeed(float speed);
-boolean I_SetSongPosition(UINT32 position);
+boolean I_SetMusicPosition(UINT32 position);
-UINT32 I_GetSongPosition(void);
+UINT32 I_GetMusicPosition(void);
boolean I_SetSongTrack(INT32 track);
diff --git a/src/lua_baselib.c b/src/lua_baselib.c
index 0fa6b38b0..65757df26 100644
--- a/src/lua_baselib.c
+++ b/src/lua_baselib.c
@@ -2255,7 +2255,7 @@ static int lib_sSpeedMusic(lua_State *L)
return 1;
}
-static int lib_sPositionMusic(lua_State *L)
+static int lib_sSetMusicPosition(lua_State *L)
{
UINT32 position = 0;
player_t *player = NULL;
@@ -2267,16 +2267,16 @@ static int lib_sPositionMusic(lua_State *L)
return LUA_ErrInvalid(L, "player_t");
}
if (!player || P_IsLocalPlayer(player))
- lua_pushboolean(L, S_PositionMusic(position));
+ lua_pushboolean(L, S_SetMusicPosition(position));
else
lua_pushboolean(L, false);
return 1;
}
-static int lib_sGetPositionMusic(lua_State *L)
+static int lib_sGetMusicPosition(lua_State *L)
{
NOHUD
- lua_pushinteger(L, (UINT32)S_GetPositionMusic());
+ lua_pushinteger(L, (UINT32)S_GetMusicPosition());
return 1;
}
@@ -2790,8 +2790,8 @@ static luaL_Reg lib[] = {
{"S_StopSound",lib_sStopSound},
{"S_ChangeMusic",lib_sChangeMusic},
{"S_SpeedMusic",lib_sSpeedMusic},
- {"S_PositionMusic",lib_sPositionMusic},
- {"S_GetPositionMusic",lib_sGetPositionMusic},
+ {"S_SetMusicPosition",lib_sSetMusicPosition},
+ {"S_GetMusicPosition",lib_sGetMusicPosition},
{"S_PauseMusic",lib_sPauseMusic},
{"S_ResumeMusic",lib_sResumeMusic},
{"S_StopMusic",lib_sStopMusic},
diff --git a/src/s_sound.c b/src/s_sound.c
index 171b59ec4..04d77fb1a 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -1417,14 +1417,14 @@ boolean S_SpeedMusic(float speed)
return I_SetSongSpeed(speed);
}
-boolean S_PositionMusic(UINT32 position)
+boolean S_SetMusicPosition(UINT32 position)
{
- return I_SetSongPosition(position);
+ return I_SetMusicPosition(position);
}
-UINT32 S_GetPositionMusic(void)
+UINT32 S_GetMusicPosition(void)
{
- return I_GetSongPosition();
+ return I_GetMusicPosition();
}
void S_StopMusic(void)
diff --git a/src/s_sound.h b/src/s_sound.h
index e86e26ad2..bb33233db 100644
--- a/src/s_sound.h
+++ b/src/s_sound.h
@@ -136,10 +136,10 @@ void S_ChangeMusic(const char *mmusic, UINT16 mflags, boolean looping);
boolean S_SpeedMusic(float speed);
// Set Position of Music
-boolean S_PositionMusic(UINT32 position);
+boolean S_SetMusicPosition(UINT32 position);
// Get Position of Music
-UINT32 S_GetPositionMusic(void);
+UINT32 S_GetMusicPosition(void);
// Stops the music.
void S_StopMusic(void);
diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c
index 69e46919f..6ccedc124 100644
--- a/src/sdl/mixer_sound.c
+++ b/src/sdl/mixer_sound.c
@@ -442,7 +442,7 @@ static void music_loop(void)
{
Mix_PlayMusic(music, 0);
Mix_SetMusicPosition(loop_point);
- music_bytes = loop_point/1000.0L*44100.0L*4; //assume 44.1khz, 4-byte length (see I_GetSongPosition)
+ music_bytes = loop_point/1000.0L*44100.0L*4; //assume 44.1khz, 4-byte length (see I_GetMusicPosition)
}
static void count_music_bytes(int chan, void *stream, int len, void *udata)
@@ -788,7 +788,7 @@ boolean I_SetSongSpeed(float speed)
return false;
}
-boolean I_SetSongPosition(UINT32 position)
+boolean I_SetMusicPosition(UINT32 position)
{
if(midimode || !music)
return false;
@@ -804,7 +804,7 @@ boolean I_SetSongPosition(UINT32 position)
return true;
}
-UINT32 I_GetSongPosition(void)
+UINT32 I_GetMusicPosition(void)
{
if(midimode)
return 0;
diff --git a/src/sdl/sdl_sound.c b/src/sdl/sdl_sound.c
index 8bf2dfe4a..42b45c563 100644
--- a/src/sdl/sdl_sound.c
+++ b/src/sdl/sdl_sound.c
@@ -1989,13 +1989,13 @@ boolean I_SetSongSpeed(float speed)
return false;
}
-boolean I_SetSongPosition(UINT32 position)
+boolean I_SetMusicPosition(UINT32 position)
{
(void)position;
return false;
}
-UINT32 I_GetSongPosition(void)
+UINT32 I_GetMusicPosition(void)
{
return 0;
}
diff --git a/src/win32/win_snd.c b/src/win32/win_snd.c
index 1fa112307..f86686945 100644
--- a/src/win32/win_snd.c
+++ b/src/win32/win_snd.c
@@ -774,7 +774,7 @@ boolean I_SetSongSpeed(float speed)
return true;
}
-boolean I_SetSongPosition(UINT32 position)
+boolean I_SetMusicPosition(UINT32 position)
{
if(midimode)
// Dummy out; this works for some MIDI, but not others.
@@ -794,7 +794,7 @@ boolean I_SetSongPosition(UINT32 position)
}
}
-UINT32 I_GetSongPosition(void)
+UINT32 I_GetMusicPosition(void)
{
if(midimode)
// Dummy out because unsupported, even though FMOD does this correctly.