From 2fdb12eb98173e825189e567ca176f131fde7001 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Mon, 14 Jan 2002 19:35:45 +0000
Subject: [PATCH] *** empty log message ***

---
 CHANGES      | 6 ++++++
 SDL_mixer.h  | 2 +-
 configure.in | 6 +++---
 mixer.c      | 4 ++--
 music.c      | 6 ++++++
 5 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index 3ce6720a..54a1c1ec 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,10 @@
 
+1.2.3:
+Pete Shinners - Mon Jan 14 11:31:26 PST 2002
+ * Added seek support for MP3 files
+Ryan Gordon - Mon Jan 14 11:30:44 PST 2002
+ * Sample "finished" callbacks are now always called when a sample is stopped.
+
 1.2.2:
 Guillaume Cottenceau - Wed Dec 19 08:59:05 PST 2001
  * Added an API for seeking in music files (implemented for MOD and Ogg music)
diff --git a/SDL_mixer.h b/SDL_mixer.h
index 1bdbae3c..90793dbc 100644
--- a/SDL_mixer.h
+++ b/SDL_mixer.h
@@ -41,7 +41,7 @@ extern "C" {
 */
 #define MIX_MAJOR_VERSION	1
 #define MIX_MINOR_VERSION	2
-#define MIX_PATCHLEVEL		2
+#define MIX_PATCHLEVEL		3
 
 /* This macro can be used to fill a version structure with the compile-time
  * version of the SDL_mixer library.
diff --git a/configure.in b/configure.in
index d08a8184..664a4448 100644
--- a/configure.in
+++ b/configure.in
@@ -13,9 +13,9 @@ dnl Set various version strings - taken gratefully from the GTk sources
 
 MAJOR_VERSION=1
 MINOR_VERSION=2
-MICRO_VERSION=2
-INTERFACE_AGE=0
-BINARY_AGE=2
+MICRO_VERSION=3
+INTERFACE_AGE=1
+BINARY_AGE=3
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION
 
 AC_SUBST(MAJOR_VERSION)
diff --git a/mixer.c b/mixer.c
index c191a109..1ff2ffb3 100644
--- a/mixer.c
+++ b/mixer.c
@@ -620,9 +620,9 @@ int Mix_PlayChannelTimed(int which, Mix_Chunk *chunk, int loops, int ticks)
 
 		/* Queue up the audio data for this channel */
 		if ( which >= 0 ) {
+			Uint32 sdl_ticks = SDL_GetTicks();
 			if (Mix_Playing(which))
 				Mix_ChannelDonePlaying(which);
-			Uint32 sdl_ticks = SDL_GetTicks();
 			mix_channel[which].samples = chunk->abuf;
 			mix_channel[which].playing = chunk->alen;
 			mix_channel[which].looping = loops;
@@ -686,9 +686,9 @@ int Mix_FadeInChannelTimed(int which, Mix_Chunk *chunk, int loops, int ms, int t
 
 		/* Queue up the audio data for this channel */
 		if ( which >= 0 ) {
+			Uint32 sdl_ticks = SDL_GetTicks();
 			if (Mix_Playing(which))
 				Mix_ChannelDonePlaying(which);
-			Uint32 sdl_ticks = SDL_GetTicks();
 			mix_channel[which].samples = chunk->abuf;
 			mix_channel[which].playing = chunk->alen;
 			mix_channel[which].looping = loops;
diff --git a/music.c b/music.c
index bcf751d4..2081b5e4 100644
--- a/music.c
+++ b/music.c
@@ -694,6 +694,12 @@ int Mix_SetMusicPosition(double position)
 			OGG_jump_to_time(music_playing->data.ogg, position);
 			return(0);
 			break;
+#endif
+#ifdef MP3_MUSIC
+		case MUS_MP3:
+			SMPEG_skip(music_playing->data.mp3, position);
+			return(0);
+			break;
 #endif
 		default:
 			/* TODO: Implement this for other music backends */