equal
deleted
inserted
replaced
109 format = AUDIO_S16; |
109 format = AUDIO_S16; |
110 } |
110 } |
111 switch (format) { |
111 switch (format) { |
112 |
112 |
113 case AUDIO_U8: { |
113 case AUDIO_U8: { |
114 #if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES) |
114 #if defined(__GNUC__) && defined(__M68000__) && !defined(__mcoldfire__) && defined(SDL_ASSEMBLY_ROUTINES) |
115 SDL_MixAudio_m68k_U8((char*)dst,(char*)src,(unsigned long)len,(long)volume,(char *)mix8); |
115 SDL_MixAudio_m68k_U8((char*)dst,(char*)src,(unsigned long)len,(long)volume,(char *)mix8); |
116 #else |
116 #else |
117 Uint8 src_sample; |
117 Uint8 src_sample; |
118 |
118 |
119 while ( len-- ) { |
119 while ( len-- ) { |
142 } |
142 } |
143 else |
143 else |
144 #endif |
144 #endif |
145 #endif |
145 #endif |
146 |
146 |
147 #if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES) |
147 #if defined(__GNUC__) && defined(__M68000__) && !defined(__mcoldfire__) && defined(SDL_ASSEMBLY_ROUTINES) |
148 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); |
149 #else |
149 #else |
150 { |
150 { |
151 Sint8 *dst8, *src8; |
151 Sint8 *dst8, *src8; |
152 Sint8 src_sample; |
152 Sint8 src_sample; |
191 } |
191 } |
192 else |
192 else |
193 #endif |
193 #endif |
194 #endif |
194 #endif |
195 |
195 |
196 #if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES) |
196 #if defined(__GNUC__) && defined(__M68000__) && !defined(__mcoldfire__) && defined(SDL_ASSEMBLY_ROUTINES) |
197 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); |
198 #else |
198 #else |
199 { |
199 { |
200 Sint16 src1, src2; |
200 Sint16 src1, src2; |
201 int dst_sample; |
201 int dst_sample; |