Mercurial > sdl-ios-xcode

comparison src/audio/SDL_mixer.c @ 3630:efb79807afe1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged r5194:5195 from branches/SDL-1.2: coldfire cpu arch support.
author Ryan C. Gordon <icculus@icculus.org>
date Sun, 10 Jan 2010 08:21:19 +0000
parents 4d46850be3f6
children f7b03b6838cb
comparison
equal deleted inserted replaced
3629:102be1cdd2bb 3630:efb79807afe1
100 100
101 switch (format) { 101 switch (format) {
102 102
103 case AUDIO_U8: 103 case AUDIO_U8:
104 { 104 {
105 #if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES) 105 #if defined(__GNUC__) && defined(__M68000__) && !defined(__mcoldfire__) && defined(SDL_ASSEMBLY_ROUTINES)
106 SDL_MixAudio_m68k_U8((char *) dst, (char *) src, 106 SDL_MixAudio_m68k_U8((char *) dst, (char *) src,
107 (unsigned long) len, (long) volume, 107 (unsigned long) len, (long) volume,
108 (char *) mix8); 108 (char *) mix8);
109 #else 109 #else
110 Uint8 src_sample; 110 Uint8 src_sample;
133 SDL_MixAudio_MMX_S8_VC((char *) dst, (char *) src, 133 SDL_MixAudio_MMX_S8_VC((char *) dst, (char *) src,
134 (unsigned int) len, (int) volume); 134 (unsigned int) len, (int) volume);
135 } else 135 } else
136 #endif 136 #endif
137 #endif 137 #endif
138 #if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES) 138 #if defined(__GNUC__) && defined(__M68000__) && !defined(__mcoldfire__) && defined(SDL_ASSEMBLY_ROUTINES)
139 SDL_MixAudio_m68k_S8((char *) dst, (char *) src, 139 SDL_MixAudio_m68k_S8((char *) dst, (char *) src,
140 (unsigned long) len, (long) volume); 140 (unsigned long) len, (long) volume);
141 #else 141 #else
142 { 142 {
143 Sint8 *dst8, *src8; 143 Sint8 *dst8, *src8;
180 SDL_MixAudio_MMX_S16_VC((char *) dst, (char *) src, 180 SDL_MixAudio_MMX_S16_VC((char *) dst, (char *) src,
181 (unsigned int) len, (int) volume); 181 (unsigned int) len, (int) volume);
182 } else 182 } else
183 #endif 183 #endif
184 #endif 184 #endif
185 #if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES) 185 #if defined(__GNUC__) && defined(__M68000__) && !defined(__mcoldfire__) && defined(SDL_ASSEMBLY_ROUTINES)
186 SDL_MixAudio_m68k_S16LSB((short *) dst, (short *) src, 186 SDL_MixAudio_m68k_S16LSB((short *) dst, (short *) src,
187 (unsigned long) len, (long) volume); 187 (unsigned long) len, (long) volume);
188 #else 188 #else
189 { 189 {
190 Sint16 src1, src2; 190 Sint16 src1, src2;
214 } 214 }
215 break; 215 break;
216 216
217 case AUDIO_S16MSB: 217 case AUDIO_S16MSB:
218 { 218 {
219 #if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES) 219 #if defined(__GNUC__) && defined(__M68000__) && !defined(__mcoldfire__) && defined(SDL_ASSEMBLY_ROUTINES)
220 SDL_MixAudio_m68k_S16MSB((short *) dst, (short *) src, 220 SDL_MixAudio_m68k_S16MSB((short *) dst, (short *) src,
221 (unsigned long) len, (long) volume); 221 (unsigned long) len, (long) volume);
222 #else 222 #else
223 Sint16 src1, src2; 223 Sint16 src1, src2;
224 int dst_sample; 224 int dst_sample;