Skip to content

Commit

Permalink
- Fixed Mix_PlayingMusic()
Browse files Browse the repository at this point in the history 
- Added real generic music looping, just like samples
- Added Mix_FadeOutInMusic() to fade out the current music and fade in
a new one in the background
  • Loading branch information
Stephane Peter committed Oct 30, 1999
1 parent 89de4e1 commit 0968985
Show file tree
Hide file tree
Showing 3 changed files with 95 additions and 26 deletions.
5 changes: 5 additions & 0 deletions mixer.h
View file
Expand Up @@ -146,6 +146,11 @@ extern int Mix_FadeInMusic(Mix_Music *music, int loops, int ms);
#define Mix_FadeInChannel(channel,chunk,loops,ms) Mix_FadeInChannelTimed(channel,chunk,loops,ms,-1)
extern int Mix_FadeInChannelTimed(int channel, Mix_Chunk *chunk, int loops, int ms, int ticks);

/* Fades out the currently playing music, and progressively fades in a new music,
all in the background. The 'ms' period is half for fading out the music and
fading in the new one */
extern int Mix_FadeOutInMusic(Mix_Music *music, int loops, int ms);

/* Set the volume in the range of 0-128 of a specific channel or chunk.
If the specified channel is -1, set volume for all channels.
Returns the original volume.
Expand Down
100 changes: 80 additions & 20 deletions music.c
View file
Expand Up @@ -62,6 +62,10 @@ static int music_volume;
static int music_swap8;
static int music_swap16;

/* For fading/chaining musics */
static Mix_Music *next_music = 0;
static int next_period = 0, next_loops = 0;

struct _Mix_Music {
enum {
MUS_CMD,
Expand Down Expand Up @@ -95,7 +99,10 @@ struct _Mix_Music {
};
static int timidity_ok;

/* Local low-level functions prototypes */
static void lowlevel_halt(void);
static int lowlevel_play(Mix_Music *music);
static int lowlevel_playing(void);

/* Mixing function */
void music_mixer(void *udata, Uint8 *stream, int len)
Expand All @@ -109,13 +116,26 @@ void music_mixer(void *udata, Uint8 *stream, int len)
lowlevel_halt(); /* This function sets music_playing to NULL */
return;
}
if ( music_playing->fading != MIX_NO_FADING ) {
if ( music_playing && music_loops && !lowlevel_playing() ) {
if ( -- music_loops ) {
Mix_RewindMusic();
if ( lowlevel_play(music_playing) < 0 )
music_stopped = 1; /* Something went wrong */
}
}
if ( !music_stopped && music_playing->fading != MIX_NO_FADING ) {
Uint32 ticks = SDL_GetTicks() - music_playing->ticks_fade;
if( ticks > music_playing->fade_length ) {
if ( music_playing->fading == MIX_FADING_OUT ) {
music_volume = music_playing->fade_volume;
music_playing->fading = MIX_NO_FADING;
lowlevel_halt();
if (next_music) {
Mix_FadeInMusic(next_music,next_loops,next_period);
next_music = 0;
next_period = next_loops = 0;
} else {
lowlevel_halt();
}
return;
}
music_playing->fading = MIX_NO_FADING;
Expand Down Expand Up @@ -418,18 +438,11 @@ void Mix_FreeMusic(Mix_Music *music)
}
}

/* Play a music chunk. Returns 0, or -1 if there was an error.
*/
int Mix_PlayMusic(Mix_Music *music, int loops)
static int lowlevel_play(Mix_Music *music)
{
/* Don't play null pointers :-) */
if ( music == NULL ) {
if(!music)
return(-1);
}
/* If the current music is fading out, wait for the fade to complete */
while ( music_playing && !music_stopped && music_playing->fading==MIX_FADING_OUT ) {
SDL_Delay(100);
}

switch (music->type) {
#ifdef CMD_MUSIC
case MUS_CMD:
Expand Down Expand Up @@ -461,16 +474,35 @@ int Mix_PlayMusic(Mix_Music *music, int loops)
SMPEG_enableaudio(music->data.mp3,1);
SMPEG_enablevideo(music->data.mp3,0);
SMPEG_setvolume(music->data.mp3,((float)music_volume/(float)MIX_MAX_VOLUME)*100.0);
SMPEG_loop(music->data.mp3, loops);
SMPEG_play(music->data.mp3);
break;
#endif
default:
/* Unknown music type?? */
return(-1);
}
return(0);
}

/* Play a music chunk. Returns 0, or -1 if there was an error.
*/
int Mix_PlayMusic(Mix_Music *music, int loops)
{
/* Don't play null pointers :-) */
if ( music == NULL ) {
return(-1);
}
/* If the current music is fading out, wait for the fade to complete */
while ( music_playing && !music_stopped && music_playing->fading==MIX_FADING_OUT ) {
SDL_Delay(100);
}

if(lowlevel_play(music)<0)
return(-1);

music_active = 1;
music_stopped = 0;
music_loops = loops;
music_playing = music;
music_playing->fading = MIX_NO_FADING;
return(0);
Expand All @@ -491,6 +523,23 @@ int Mix_FadeInMusic(Mix_Music *music, int loops, int ms)
return(0);
}

/* Fades out the currently playing music, and progressively fades in a new music,
all in the background. The 'ms' period is half for fading out the music and
fading in the new one */
int Mix_FadeOutInMusic(Mix_Music *music, int loops, int ms)
{
if( music_stopped || !music_playing ) {
return Mix_FadeInMusic(music,loops,ms/2);
} else {
/* Set up the data for chaining the next music */
next_music = music;
next_period = ms/2;
next_loops = loops;
/* Fade out the current music */
Mix_FadeOutMusic(ms/2);
}
}

/* Set the music volume */
int Mix_VolumeMusic(int volume)
{
Expand Down Expand Up @@ -668,47 +717,58 @@ void Mix_RewindMusic(void)
}

/* Check the status of the music */
int Mix_PlayingMusic(void)
static int lowlevel_playing(void)
{
if ( music_playing && !music_stopped ) {
switch (music_playing->type) {
#ifdef CMD_MUSIC
case MUS_CMD:
if (!MusicCMD_Active(music_playing->data.cmd)) {
music_playing = 0;
return(0);
}
break;
#endif
#ifdef WAV_MUSIC
case MUS_WAV:
if ( ! WAVStream_Active() ) {
music_playing = 0;
return(0);
}
break;
#endif
#ifdef MOD_MUSIC
case MUS_MOD:
if ( ! Player_Active() ) {
music_playing = 0;
return(0);
}
break;
#endif
#ifdef MID_MUSIC
case MUS_MID:
if ( ! Timidity_Active() ) {
music_playing = 0;
return(0);
}
break;
#endif
#ifdef MP3_MUSIC
case MUS_MP3:
if(SMPEG_status(music_playing->data.mp3)!=SMPEG_PLAYING)
music_playing = 0;
return(0);
break;
#endif
}
}
return(music_playing ? 1 : 0);
return(1);
}

int Mix_PlayingMusic(void)
{
int active;
active = lowlevel_playing();
if ( !active && music_loops ) {
return(1);
} else {
return(active);
}
}

/* Set the external music playback command */
Expand Down
16 changes: 10 additions & 6 deletions playmus.c
View file
Expand Up @@ -43,27 +43,28 @@ void CleanUp(void)
Mix_FadeOutMusic(1500);
SDL_Delay(1500);
}
if ( audio_open ) {
Mix_CloseAudio();
audio_open = 0;
}
if ( music ) {
Mix_FreeMusic(music);
music = NULL;
}
if ( audio_open ) {
Mix_CloseAudio();
audio_open = 0;
}
SDL_Quit();
}

void Usage(char *argv0)
{
fprintf(stderr, "Usage: %s [-8] [-r rate] [-s] <musicfile>\n", argv0);
fprintf(stderr, "Usage: %s |-l] [-8] [-r rate] [-s] <musicfile>\n", argv0);
}

main(int argc, char *argv[])
{
Uint32 audio_rate;
Uint16 audio_format;
int audio_channels;
int looping = 0;
int i;

/* Initialize variables */
Expand All @@ -80,6 +81,9 @@ main(int argc, char *argv[])
if ( strcmp(argv[i], "-m") == 0 ) {
audio_channels = 1;
} else
if ( strcmp(argv[i], "-l") == 0 ) {
looping = -1;
} else
if ( strcmp(argv[i], "-8") == 0 ) {
audio_format = AUDIO_U8;
} else {
Expand Down Expand Up @@ -125,7 +129,7 @@ main(int argc, char *argv[])
}

/* Play and then exit */
Mix_FadeInMusic(music,0,2000);
Mix_FadeInMusic(music,looping,2000);
while ( Mix_PlayingMusic() ) {
SDL_Delay(100);
}
Expand Down

0 comments on commit 0968985

Please sign in to comment.