src/audio/SDL_mixer.c
branchSDL-1.2
changeset 4322 a8e5b518e194
parent 4159 a1b03ba2fcd0
child 4374 124629b76853
equal deleted inserted replaced
4321:c9a1de1eda57 4322:a8e5b518e194
   126 #endif
   126 #endif
   127 		}
   127 		}
   128 		break;
   128 		break;
   129 
   129 
   130 		case AUDIO_S8: {
   130 		case AUDIO_S8: {
       
   131 #if defined(SDL_BUGGY_MMX_MIXERS) /* buggy, so we're disabling them. --ryan. */
   131 #if defined(__GNUC__) && defined(__i386__) && defined(SDL_ASSEMBLY_ROUTINES)
   132 #if defined(__GNUC__) && defined(__i386__) && defined(SDL_ASSEMBLY_ROUTINES)
   132 			if (SDL_HasMMX())
   133 			if (SDL_HasMMX())
   133 			{
   134 			{
   134 				SDL_MixAudio_MMX_S8((char*)dst,(char*)src,(unsigned int)len,(int)volume);
   135 				SDL_MixAudio_MMX_S8((char*)dst,(char*)src,(unsigned int)len,(int)volume);
   135 			}
   136 			}
   139 			{
   140 			{
   140 				SDL_MixAudio_MMX_S8_VC((char*)dst,(char*)src,(unsigned int)len,(int)volume);
   141 				SDL_MixAudio_MMX_S8_VC((char*)dst,(char*)src,(unsigned int)len,(int)volume);
   141 			}
   142 			}
   142 			else
   143 			else
   143 #endif
   144 #endif
       
   145 #endif
       
   146 
   144 #if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES)
   147 #if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES)
   145 			SDL_MixAudio_m68k_S8((char*)dst,(char*)src,(unsigned long)len,(long)volume);
   148 			SDL_MixAudio_m68k_S8((char*)dst,(char*)src,(unsigned long)len,(long)volume);
   146 #else
   149 #else
   147 			{
   150 			{
   148 			Sint8 *dst8, *src8;
   151 			Sint8 *dst8, *src8;
   172 #endif
   175 #endif
   173 		}
   176 		}
   174 		break;
   177 		break;
   175 
   178 
   176 		case AUDIO_S16LSB: {
   179 		case AUDIO_S16LSB: {
       
   180 #if defined(SDL_BUGGY_MMX_MIXERS) /* buggy, so we're disabling them. --ryan. */
   177 #if defined(__GNUC__) && defined(__i386__) && defined(SDL_ASSEMBLY_ROUTINES)
   181 #if defined(__GNUC__) && defined(__i386__) && defined(SDL_ASSEMBLY_ROUTINES)
   178 			if (SDL_HasMMX())
   182 			if (SDL_HasMMX())
   179 			{
   183 			{
   180 				SDL_MixAudio_MMX_S16((char*)dst,(char*)src,(unsigned int)len,(int)volume);
   184 				SDL_MixAudio_MMX_S16((char*)dst,(char*)src,(unsigned int)len,(int)volume);
   181 			}
   185 			}
   185 			{
   189 			{
   186 				SDL_MixAudio_MMX_S16_VC((char*)dst,(char*)src,(unsigned int)len,(int)volume);
   190 				SDL_MixAudio_MMX_S16_VC((char*)dst,(char*)src,(unsigned int)len,(int)volume);
   187 			}
   191 			}
   188 			else
   192 			else
   189 #endif
   193 #endif
       
   194 #endif
       
   195 
   190 #if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES)
   196 #if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES)
   191 			SDL_MixAudio_m68k_S16LSB((short*)dst,(short*)src,(unsigned long)len,(long)volume);
   197 			SDL_MixAudio_m68k_S16LSB((short*)dst,(short*)src,(unsigned long)len,(long)volume);
   192 #else
   198 #else
   193 			{
   199 			{
   194 			Sint16 src1, src2;
   200 			Sint16 src1, src2;