We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Allow looping / Pattern jumps of MOD music using libmodplug

SetModLooping.diff (text/plain), 2.58 KB, created by Travis R. on 2014-08-30 13:50:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Travis R.

Created: 2014-08-30 13:50:44 UTC

Size: 2.58 KB

patch

obsolete

>diff -r 9599bb0ff844 SDL_mixer.h
>--- a/SDL_mixer.h	Sat Aug 23 10:57:26 2014 -0700
>+++ b/SDL_mixer.h	Thu Aug 28 12:05:59 2014 -0400
>@@ -535,6 +535,9 @@
> extern DECLSPEC int SDLCALL Mix_PlayChannelTimed(int channel, Mix_Chunk *chunk, int loops, int ticks);
> extern DECLSPEC int SDLCALL Mix_PlayMusic(Mix_Music *music, int loops);
> 
>+/* Loop MOD music */
>+extern DECLSPEC void SDLCALL Mix_SetMODLoopCount(int loops);
>+
> /* Fade in music or a channel over "ms" milliseconds, same semantics as the "Play" functions */
> extern DECLSPEC int SDLCALL Mix_FadeInMusic(Mix_Music *music, int loops, int ms);
> extern DECLSPEC int SDLCALL Mix_FadeInMusicPos(Mix_Music *music, int loops, int ms, double position);
>diff -r 9599bb0ff844 music.c
>--- a/music.c	Sat Aug 23 10:57:26 2014 -0700
>+++ b/music.c	Thu Aug 28 12:05:59 2014 -0400
>@@ -78,6 +78,7 @@
> static char *music_cmd = NULL;
> static Mix_Music * volatile music_playing = NULL;
> static int music_volume = MIX_MAX_VOLUME;
>+static int music_mod_loops = 0;
> 
> struct _Mix_Music {
>     Mix_MusicType type;
>@@ -178,6 +179,7 @@
> static int  music_internal_position(double position);
> static int  music_internal_playing();
> static void music_internal_halt(void);
>+static void music_internal_set_mod_loops();
> 
> 
> /* Support for hooking when the music has finished */
>@@ -1045,6 +1047,27 @@
>     return Mix_FadeInMusicPos(music, loops, 0, 0.0);
> }
> 
>+/* Explicitly loop MOD music */
>+
>+void Mix_SetMODLoopCount(int loops)
>+{
>+	music_mod_loops = loops;
>+
>+	SDL_LockAudio();
>+	music_internal_set_mod_loops();
>+	SDL_UnlockAudio();
>+
>+}
>+
>+/* Explicitly loop MOD music */
>+
>+static void music_internal_set_mod_loops()
>+{
>+#ifdef MODPLUG_MUSIC
>+	modplug_set_loops(music_mod_loops);
>+#endif
>+}
>+
> /* Set the playing music position */
> int music_internal_position(double position)
> {
>diff -r 9599bb0ff844 music_modplug.c
>--- a/music_modplug.c	Sat Aug 23 10:57:26 2014 -0700
>+++ b/music_modplug.c	Thu Aug 28 12:05:59 2014 -0400
>@@ -261,4 +261,12 @@
>     modplug.ModPlug_Seek(music->file,(int)(time*1000));
> }
> 
>+/* Loop MOD music */
>+void modplug_set_loops(int loops)
>+{
>+	modplug.ModPlug_GetSettings(&settings);
>+	settings.mLoopCount = loops;
>+	modplug.ModPlug_SetSettings(&settings);
>+}
>+
> #endif /* MODPLUG_MUSIC */
>diff -r 9599bb0ff844 music_modplug.h
>--- a/music_modplug.h	Sat Aug 23 10:57:26 2014 -0700
>+++ b/music_modplug.h	Thu Aug 28 12:05:59 2014 -0400
>@@ -64,4 +64,7 @@
> /* Jump (seek) to a given position (time is in seconds) */
> void modplug_jump_to_time(modplug_data *music, double time);
> 
>+/* Set the number of times the module can loop */
>+void modplug_set_loops(int loops);
>+
> #endif /* MODPLUG_MUSIC */

Actions: View | Diff

Attachments on bug 1499: 1857

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.