*** empty log message ***
authorSam Lantinga <slouken@libsdl.org>
Mon, 14 Jan 2002 19:35:45 +0000
changeset 158954c719d0359
parent 157 3d87d169927f
child 159 01490534f9fe
*** empty log message ***
CHANGES
SDL_mixer.h
configure.in
mixer.c
music.c
     1.1 --- a/CHANGES	Mon Jan 14 19:29:17 2002 +0000
     1.2 +++ b/CHANGES	Mon Jan 14 19:35:45 2002 +0000
     1.3 @@ -1,3 +1,9 @@
     1.4 +
     1.5 +1.2.3:
     1.6 +Pete Shinners - Mon Jan 14 11:31:26 PST 2002
     1.7 + * Added seek support for MP3 files
     1.8 +Ryan Gordon - Mon Jan 14 11:30:44 PST 2002
     1.9 + * Sample "finished" callbacks are now always called when a sample is stopped.
    1.10  
    1.11  1.2.2:
    1.12  Guillaume Cottenceau - Wed Dec 19 08:59:05 PST 2001
     2.1 --- a/SDL_mixer.h	Mon Jan 14 19:29:17 2002 +0000
     2.2 +++ b/SDL_mixer.h	Mon Jan 14 19:35:45 2002 +0000
     2.3 @@ -41,7 +41,7 @@
     2.4  */
     2.5  #define MIX_MAJOR_VERSION	1
     2.6  #define MIX_MINOR_VERSION	2
     2.7 -#define MIX_PATCHLEVEL		2
     2.8 +#define MIX_PATCHLEVEL		3
     2.9  
    2.10  /* This macro can be used to fill a version structure with the compile-time
    2.11   * version of the SDL_mixer library.
     3.1 --- a/configure.in	Mon Jan 14 19:29:17 2002 +0000
     3.2 +++ b/configure.in	Mon Jan 14 19:35:45 2002 +0000
     3.3 @@ -13,9 +13,9 @@
     3.4  
     3.5  MAJOR_VERSION=1
     3.6  MINOR_VERSION=2
     3.7 -MICRO_VERSION=2
     3.8 -INTERFACE_AGE=0
     3.9 -BINARY_AGE=2
    3.10 +MICRO_VERSION=3
    3.11 +INTERFACE_AGE=1
    3.12 +BINARY_AGE=3
    3.13  VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION
    3.14  
    3.15  AC_SUBST(MAJOR_VERSION)
     4.1 --- a/mixer.c	Mon Jan 14 19:29:17 2002 +0000
     4.2 +++ b/mixer.c	Mon Jan 14 19:35:45 2002 +0000
     4.3 @@ -620,9 +620,9 @@
     4.4  
     4.5  		/* Queue up the audio data for this channel */
     4.6  		if ( which >= 0 ) {
     4.7 +			Uint32 sdl_ticks = SDL_GetTicks();
     4.8  			if (Mix_Playing(which))
     4.9  				Mix_ChannelDonePlaying(which);
    4.10 -			Uint32 sdl_ticks = SDL_GetTicks();
    4.11  			mix_channel[which].samples = chunk->abuf;
    4.12  			mix_channel[which].playing = chunk->alen;
    4.13  			mix_channel[which].looping = loops;
    4.14 @@ -686,9 +686,9 @@
    4.15  
    4.16  		/* Queue up the audio data for this channel */
    4.17  		if ( which >= 0 ) {
    4.18 +			Uint32 sdl_ticks = SDL_GetTicks();
    4.19  			if (Mix_Playing(which))
    4.20  				Mix_ChannelDonePlaying(which);
    4.21 -			Uint32 sdl_ticks = SDL_GetTicks();
    4.22  			mix_channel[which].samples = chunk->abuf;
    4.23  			mix_channel[which].playing = chunk->alen;
    4.24  			mix_channel[which].looping = loops;
     5.1 --- a/music.c	Mon Jan 14 19:29:17 2002 +0000
     5.2 +++ b/music.c	Mon Jan 14 19:35:45 2002 +0000
     5.3 @@ -695,6 +695,12 @@
     5.4  			return(0);
     5.5  			break;
     5.6  #endif
     5.7 +#ifdef MP3_MUSIC
     5.8 +		case MUS_MP3:
     5.9 +			SMPEG_skip(music_playing->data.mp3, position);
    5.10 +			return(0);
    5.11 +			break;
    5.12 +#endif
    5.13  		default:
    5.14  			/* TODO: Implement this for other music backends */
    5.15  			break;