diff options
Diffstat (limited to 'apps/plugins/sdl/SDL_mixer/music.c')
-rw-r--r-- | apps/plugins/sdl/SDL_mixer/music.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/apps/plugins/sdl/SDL_mixer/music.c b/apps/plugins/sdl/SDL_mixer/music.c index dce16a9de3..075b89b0a3 100644 --- a/apps/plugins/sdl/SDL_mixer/music.c +++ b/apps/plugins/sdl/SDL_mixer/music.c | |||
@@ -173,7 +173,7 @@ static void music_internal_initialize_volume(void); | |||
173 | static void music_internal_volume(int volume); | 173 | static void music_internal_volume(int volume); |
174 | static int music_internal_play(Mix_Music *music, double position); | 174 | static int music_internal_play(Mix_Music *music, double position); |
175 | static int music_internal_position(double position); | 175 | static int music_internal_position(double position); |
176 | static int music_internal_playing(); | 176 | static int music_internal_playing(void); |
177 | static void music_internal_halt(void); | 177 | static void music_internal_halt(void); |
178 | 178 | ||
179 | 179 | ||
@@ -193,8 +193,8 @@ void Mix_HookMusicFinished(void (*music_finished)(void)) | |||
193 | static int music_halt_or_loop (void) | 193 | static int music_halt_or_loop (void) |
194 | { | 194 | { |
195 | /* Restart music if it has to loop */ | 195 | /* Restart music if it has to loop */ |
196 | 196 | ||
197 | if (!music_internal_playing()) | 197 | if (!music_internal_playing()) |
198 | { | 198 | { |
199 | #ifdef USE_NATIVE_MIDI | 199 | #ifdef USE_NATIVE_MIDI |
200 | /* Native MIDI handles looping internally */ | 200 | /* Native MIDI handles looping internally */ |
@@ -211,17 +211,17 @@ static int music_halt_or_loop (void) | |||
211 | current_fade = music_playing->fading; | 211 | current_fade = music_playing->fading; |
212 | music_internal_play(music_playing, 0.0); | 212 | music_internal_play(music_playing, 0.0); |
213 | music_playing->fading = current_fade; | 213 | music_playing->fading = current_fade; |
214 | } | 214 | } |
215 | else | 215 | else |
216 | { | 216 | { |
217 | music_internal_halt(); | 217 | music_internal_halt(); |
218 | if (music_finished_hook) | 218 | if (music_finished_hook) |
219 | music_finished_hook(); | 219 | music_finished_hook(); |
220 | 220 | ||
221 | return 0; | 221 | return 0; |
222 | } | 222 | } |
223 | } | 223 | } |
224 | 224 | ||
225 | return 1; | 225 | return 1; |
226 | } | 226 | } |
227 | 227 | ||
@@ -258,7 +258,7 @@ void music_mixer(void *udata, Uint8 *stream, int len) | |||
258 | music_playing->fading = MIX_NO_FADING; | 258 | music_playing->fading = MIX_NO_FADING; |
259 | } | 259 | } |
260 | } | 260 | } |
261 | 261 | ||
262 | music_halt_or_loop(); | 262 | music_halt_or_loop(); |
263 | if (!music_internal_playing()) | 263 | if (!music_internal_playing()) |
264 | return; | 264 | return; |
@@ -309,7 +309,7 @@ void music_mixer(void *udata, Uint8 *stream, int len) | |||
309 | #endif | 309 | #endif |
310 | #ifdef OGG_MUSIC | 310 | #ifdef OGG_MUSIC |
311 | case MUS_OGG: | 311 | case MUS_OGG: |
312 | 312 | ||
313 | left = OGG_playAudio(music_playing->data.ogg, stream, len); | 313 | left = OGG_playAudio(music_playing->data.ogg, stream, len); |
314 | break; | 314 | break; |
315 | #endif | 315 | #endif |
@@ -334,7 +334,7 @@ void music_mixer(void *udata, Uint8 *stream, int len) | |||
334 | } | 334 | } |
335 | } | 335 | } |
336 | 336 | ||
337 | 337 | ||
338 | skip: | 338 | skip: |
339 | /* Handle seamless music looping */ | 339 | /* Handle seamless music looping */ |
340 | if (left > 0 && left < len) { | 340 | if (left > 0 && left < len) { |