Skip to content
Permalink
Browse files

*** empty log message ***

  • Loading branch information
slouken committed Jan 14, 2002
1 parent b163119 commit 2fdb12eb98173e825189e567ca176f131fde7001
Showing with 18 additions and 6 deletions.
  1. +6 −0 CHANGES
  2. +1 −1 SDL_mixer.h
  3. +3 −3 configure.in
  4. +2 −2 mixer.c
  5. +6 −0 music.c
@@ -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)
@@ -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.
@@ -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)
@@ -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;
@@ -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 */

0 comments on commit 2fdb12e

Please sign in to comment.