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] Patch for pause and resume music with Windows native MIDI decoder, 2nd version

SDL_mixer_bug_2909_pause_and_resume_music_with_windows_native_midi_patch_2.diff (text/plain), 3.08 KB, created by Philipp Wiesemann on 2015-08-21 19:52:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Philipp Wiesemann

Created: 2015-08-21 19:52:15 UTC

Size: 3.08 KB

patch

obsolete

>diff -r 1aca2b6d570f music.c
>--- a/music.c	Sat Aug 01 21:58:32 2015 -0700
>+++ b/music.c	Fri Aug 21 21:42:14 2015 +0200
>@@ -1359,11 +1359,47 @@
> void Mix_PauseMusic(void)
> {
>     music_active = 0;
>+
>+    SDL_LockAudio();
>+    if ( music_playing ) {
>+        switch ( music_playing->type ) {
>+#ifdef MID_MUSIC
>+            case MUS_MID:
>+#ifdef USE_NATIVE_MIDI
>+            if ( native_midi_ok ) {
>+                native_midi_pause();
>+            }
>+#endif
>+            break;
>+#endif
>+            default:
>+            break;
>+        }
>+    }
>+    SDL_UnlockAudio();
> }
> 
> void Mix_ResumeMusic(void)
> {
>     music_active = 1;
>+
>+    SDL_LockAudio();
>+    if ( music_playing ) {
>+        switch ( music_playing->type ) {
>+#ifdef MID_MUSIC
>+            case MUS_MID:
>+#ifdef USE_NATIVE_MIDI
>+            if ( native_midi_ok ) {
>+                native_midi_resume();
>+            }
>+#endif
>+            break;
>+#endif
>+            default:
>+            break;
>+        }
>+    }
>+    SDL_UnlockAudio();
> }
> 
> void Mix_RewindMusic(void)
>diff -r 1aca2b6d570f native_midi/native_midi.h
>--- a/native_midi/native_midi.h	Sat Aug 01 21:58:32 2015 -0700
>+++ b/native_midi/native_midi.h	Fri Aug 21 21:42:14 2015 +0200
>@@ -30,6 +30,8 @@
> NativeMidiSong *native_midi_loadsong_RW(SDL_RWops *src, int freesrc);
> void native_midi_freesong(NativeMidiSong *song);
> void native_midi_start(NativeMidiSong *song, int loops);
>+void native_midi_pause();
>+void native_midi_resume();
> void native_midi_stop();
> int native_midi_active();
> void native_midi_setvolume(int volume);
>diff -r 1aca2b6d570f native_midi/native_midi_haiku.cpp
>--- a/native_midi/native_midi_haiku.cpp	Sat Aug 01 21:58:32 2015 -0700
>+++ b/native_midi/native_midi_haiku.cpp	Fri Aug 21 21:42:14 2015 +0200
>@@ -261,6 +261,12 @@
>   song->store->Start();
>   currentSong = song;
> }
>+void native_midi_pause()
>+{
>+}
>+void native_midi_resume()
>+{
>+}
> void native_midi_stop()
> {
>   if (currentSong == NULL) return;
>diff -r 1aca2b6d570f native_midi/native_midi_mac.c
>--- a/native_midi/native_midi_mac.c	Sat Aug 01 21:58:32 2015 -0700
>+++ b/native_midi/native_midi_mac.c	Fri Aug 21 21:42:14 2015 +0200
>@@ -241,6 +241,14 @@
>     SDL_PauseAudio(0);
> }
> 
>+void native_midi_pause()
>+{
>+}
>+
>+void native_midi_resume()
>+{
>+}
>+
> void native_midi_stop()
> {
>     if (gTunePlayer == NULL)
>diff -r 1aca2b6d570f native_midi/native_midi_macosx.c
>--- a/native_midi/native_midi_macosx.c	Sat Aug 01 21:58:32 2015 -0700
>+++ b/native_midi/native_midi_macosx.c	Fri Aug 21 21:42:14 2015 +0200
>@@ -298,6 +298,14 @@
>     }
> }
> 
>+void native_midi_pause()
>+{
>+}
>+
>+void native_midi_resume()
>+{
>+}
>+
> int native_midi_active()
> {
>     MusicTimeStamp currentTime = 0;
>diff -r 1aca2b6d570f native_midi/native_midi_win32.c
>--- a/native_midi/native_midi_win32.c	Sat Aug 01 21:58:32 2015 -0700
>+++ b/native_midi/native_midi_win32.c	Fri Aug 21 21:42:14 2015 +0200
>@@ -272,6 +272,20 @@
>   }
> }
> 
>+void native_midi_pause()
>+{
>+  if (!hMidiStream)
>+    return;
>+  midiStreamPause(hMidiStream);
>+}
>+
>+void native_midi_resume()
>+{
>+  if (!hMidiStream)
>+    return;
>+  midiStreamRestart(hMidiStream);
>+}
>+
> void native_midi_stop()
> {
>   if (!hMidiStream)

Actions: View | Diff

Attachments on bug 2909: 2245 | 2251

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.