src/audio/SDL_mixer.c
changeset 739 22dbf364c017
parent 633 873c2598f969
child 746 72ef7ce609ef
     1.1 --- a/src/audio/SDL_mixer.c	Fri Nov 14 20:21:22 2003 +0000
     1.2 +++ b/src/audio/SDL_mixer.c	Tue Nov 18 01:27:06 2003 +0000
     1.3 @@ -34,28 +34,13 @@
     1.4  #include "SDL_audio.h"
     1.5  #include "SDL_mutex.h"
     1.6  #include "SDL_timer.h"
     1.7 +#include "SDL_cpuinfo.h"
     1.8  #include "SDL_sysaudio.h"
     1.9 +#include "SDL_cpuinfo.h"
    1.10  #include "SDL_mixer_MMX.h"
    1.11  #include "SDL_mixer_MMX_VC.h"
    1.12  #include "SDL_mixer_m68k.h"
    1.13  
    1.14 -/* Function to check the CPU flags */
    1.15 -#define MMX_CPU		0x800000
    1.16 -#ifdef USE_ASMBLIT
    1.17 -#define CPU_Flags()	Hermes_X86_CPU()
    1.18 -#else
    1.19 -#define CPU_Flags()	0L
    1.20 -#endif
    1.21 -
    1.22 -#ifdef USE_ASMBLIT
    1.23 -#define X86_ASSEMBLER
    1.24 -#define HermesConverterInterface	void
    1.25 -#define HermesClearInterface		void
    1.26 -#define STACKCALL
    1.27 -
    1.28 -#include "HeadX86.h"
    1.29 -#endif
    1.30 -
    1.31  /* This table is used to add two sound values together and pin
    1.32   * the value to avoid overflow.  (used with permission from ARDI)
    1.33   * Changed to use 0xFE instead of 0xFF for better sound quality.
    1.34 @@ -154,7 +139,7 @@
    1.35  
    1.36  		case AUDIO_S8: {
    1.37  #if defined(i386) && defined(__GNUC__) && defined(USE_ASMBLIT)
    1.38 -			if (CPU_Flags() & MMX_CPU)
    1.39 +			if (SDL_HasMMX())
    1.40  			{
    1.41  				SDL_MixAudio_MMX_S8((char*)dst,(char*)src,(unsigned int)len,(int)volume);
    1.42  			}
    1.43 @@ -201,7 +186,7 @@
    1.44  
    1.45  		case AUDIO_S16LSB: {
    1.46  #if defined(i386) && defined(__GNUC__) && defined(USE_ASMBLIT)
    1.47 -			if (CPU_Flags() & MMX_CPU)
    1.48 +			if (SDL_HasMMX())
    1.49  			{
    1.50  				SDL_MixAudio_MMX_S16((char*)dst,(char*)src,(unsigned int)len,(int)volume);
    1.51  			}