native_midi/native_midi_macosx.c
changeset 718 fb0562cc1559
parent 625 1d489d8ec2e0
child 779 a2b494c054d5
     1.1 --- a/native_midi/native_midi_macosx.c	Tue Jan 12 05:56:16 2016 -0800
     1.2 +++ b/native_midi/native_midi_macosx.c	Fri Jan 29 12:44:13 2016 -0800
     1.3 @@ -31,8 +31,9 @@
     1.4  #include <AudioToolbox/AudioToolbox.h>
     1.5  #include <AvailabilityMacros.h>
     1.6  
     1.7 +#include "SDL_endian.h"
     1.8  #include "../SDL_mixer.h"
     1.9 -#include "SDL_endian.h"
    1.10 +#include "../mixer.h"
    1.11  #include "native_midi.h"
    1.12  
    1.13  /* Native Midi song */
    1.14 @@ -264,7 +265,7 @@
    1.15          return;
    1.16  
    1.17      SDL_PauseAudio(1);
    1.18 -    SDL_UnlockAudio();
    1.19 +    Mix_UnlockAudio();
    1.20  
    1.21      if (currentsong)
    1.22          MusicPlayerStop(currentsong->player);
    1.23 @@ -282,7 +283,7 @@
    1.24      latched_volume++;  /* just make this not match. */
    1.25      native_midi_setvolume(vol);
    1.26  
    1.27 -    SDL_LockAudio();
    1.28 +    Mix_LockAudio();
    1.29      SDL_PauseAudio(0);
    1.30  }
    1.31  
    1.32 @@ -290,10 +291,10 @@
    1.33  {
    1.34      if (currentsong) {
    1.35          SDL_PauseAudio(1);
    1.36 -        SDL_UnlockAudio();
    1.37 +        Mix_UnlockAudio();
    1.38          MusicPlayerStop(currentsong->player);
    1.39          currentsong = NULL;
    1.40 -        SDL_LockAudio();
    1.41 +        Mix_LockAudio();
    1.42          SDL_PauseAudio(0);
    1.43      }
    1.44  }