Change get/set music position to UINT32 parameter, milliseconds

# Conflicts:
#	src/d_netcmd.c
#	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

@@ -143,13 +143,13 @@ boolean I_SetSongSpeed(float speed)
         return false;
 }
 
-boolean I_SetSongPosition(float position)
+boolean I_SetSongPosition(UINT32 position)
 {
         (void)position;
         return false;
 }
 
-float I_GetSongPosition(void)
+UINT32 I_GetSongPosition(void)
 {
-        return 0.0f;
+        return 0;
 }

src/d_netcmd.c

@@ -4041,6 +4041,15 @@ static void Command_Tunes_f(void)
 		if (speed > 0.0f)
 			S_SpeedMusic(speed);
 	}
+<<<<<<< HEAD
+=======
+
+	if (argc > 4)
+	{
+		UINT32 position = (UINT32)atoi(COM_Argv(4));
+		S_PositionMusic(position);
+	}
+>>>>>>> f453fb65... Change get/set music position to UINT32 parameter, milliseconds
 }
 
 static void Command_RestartAudio_f(void)

src/djgppdos/i_sound.c

@@ -550,13 +550,13 @@ boolean I_SetSongSpeed(float speed)
 	return false;
 }
 
-boolean I_SetSongPosition(float position)
+boolean I_SetSongPosition(UINT32 position)
 {
     (void)position;
     return false;
 }
 
-float I_GetSongPosition(void)
+UINT32 I_GetSongPosition(void)
 {
-    return 0.0f;
+    return 0.;
 }

src/dummy/i_sound.c

@@ -146,13 +146,13 @@ boolean I_SetSongTrack(int track)
 	return false;
 }
 
-boolean I_SetSongPosition(float position)
+boolean I_SetSongPosition(UINT32 position)
 {
     (void)position;
     return false;
 }
 
-float I_GetSongPosition(void)
+UINT32 I_GetSongPosition(void)
 {
-    return 0.0f;
+    return 0;
 }

src/i_sound.h

@@ -206,9 +206,9 @@ void I_ShutdownDigMusic(void);
 
 boolean I_SetSongSpeed(float speed);
 
-boolean I_SetSongPosition(float position);
+boolean I_SetSongPosition(UINT32 position);
 
-float I_GetSongPosition(void);
+UINT32 I_GetSongPosition(void);
 
 boolean I_SetSongTrack(INT32 track);
 

src/s_sound.c

@@ -1404,12 +1404,12 @@ boolean S_SpeedMusic(float speed)
 	return I_SetSongSpeed(speed);
 }
 
-boolean S_PositionMusic(float position)
+boolean S_PositionMusic(UINT32 position)
 {
 	return I_SetSongPosition(position);
 }
 
-float S_GetPositionMusic(void)
+UINT32 S_GetPositionMusic(void)
 {
 	return I_GetSongPosition();
 }

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(float position);
+boolean S_PositionMusic(UINT32 position);
 
 // Get Position of Music
-float S_GetPositionMusic(void);
+UINT32 S_GetPositionMusic(void);
 
 // Stops the music.
 void S_StopMusic(void);

src/sdl/mixer_sound.c

@@ -736,21 +736,17 @@ boolean I_SetSongSpeed(float speed)
 	return false;
 }
 
-boolean I_SetSongPosition(float position)
+boolean I_SetSongPosition(UINT32 position)
 {
-	if (position > 0.0f) 
+	int r;
-	{
 	Mix_RewindMusic(); // needed for MP3
-		Mix_SetMusicPosition(position);
+	r = Mix_SetMusicPosition(position*1000);
-		return true;
+	return r == 0;
-	}
-	(void)position;
-	return false;
 }
 
-float I_GetSongPosition(void)
+UINT32 I_GetSongPosition(void)
 {
-	return 0.0f;
+	return 0;
 }
 
 boolean I_SetSongTrack(int track)

src/sdl/sdl_sound.c

@@ -1973,15 +1973,15 @@ boolean I_SetSongSpeed(float speed)
 	return false;
 }
 
-boolean I_SetSongPosition(float position)
+boolean I_SetSongPosition(UINT32 position)
 {
 	(void)position;
 	return false;
 }
 
-float I_GetSongPosition(void)
+UINT32 I_GetSongPosition(void)
 {
-	return 0.0f;
+	return 0;
 }
 
 boolean I_SetSongTrack(int track)

src/win32/win_snd.c

@@ -756,13 +756,10 @@ boolean I_SetSongSpeed(float speed)
 	return true;
 }
 
-boolean I_SetSongPosition(float position)
+boolean I_SetSongPosition(UINT32 position)
 {
-	if(position > 0.0f) 
-	{
 	FMOD_RESULT e;
-		position *= 1000.0f;
+	e = FMOD_Channel_SetPosition(music_channel, position, FMOD_TIMEUNIT_MS);
-		e = FMOD_Channel_SetPosition(music_channel, (UINT32)position, FMOD_TIMEUNIT_MS);
 	if (e == FMOD_OK)
 		return true;
 	else if (e == FMOD_ERR_UNSUPPORTED // Only music modules, numbnuts!
@@ -773,21 +770,17 @@ boolean I_SetSongPosition(float position)
 		FMR_MUSIC(e);
 		return false;
 	}
-		
-	}
-	(void)position;
-	return false;
 }
 
-float I_GetSongPosition(void)
+UINT32 I_GetSongPosition(void)
 {
 	FMOD_RESULT e;
-	UINT32 fmposition = 0.0;
+	unsigned int fmposition = 0;
 	e = FMOD_Channel_GetPosition(music_channel, &fmposition, FMOD_TIMEUNIT_MS);
 	if (e == FMOD_OK)
-		return fmposition / 1000.0f;
+		return (UINT32)fmposition;
 	else
-		return 0.0f;
+		return 0;
 }
 
 boolean I_SetSongTrack(INT32 track)