mirror of https://github.com/encounter/SDL.git
SDL_mixer.c: remove calls to non-existing m68k asm code.
This commit is contained in:
parent
5b2e011e6d
commit
8476df3e31
|
@ -98,11 +98,6 @@ SDL_MixAudioFormat(Uint8 * dst, const Uint8 * src, SDL_AudioFormat format,
|
||||||
|
|
||||||
case AUDIO_U8:
|
case AUDIO_U8:
|
||||||
{
|
{
|
||||||
#if defined(__GNUC__) && defined(__M68000__) && !defined(__mcoldfire__) && defined(SDL_ASSEMBLY_ROUTINES)
|
|
||||||
SDL_MixAudio_m68k_U8((char *) dst, (char *) src,
|
|
||||||
(unsigned long) len, (long) volume,
|
|
||||||
(char *) mix8);
|
|
||||||
#else
|
|
||||||
Uint8 src_sample;
|
Uint8 src_sample;
|
||||||
|
|
||||||
while (len--) {
|
while (len--) {
|
||||||
|
@ -112,7 +107,6 @@ SDL_MixAudioFormat(Uint8 * dst, const Uint8 * src, SDL_AudioFormat format,
|
||||||
++dst;
|
++dst;
|
||||||
++src;
|
++src;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -172,10 +166,6 @@ SDL_MixAudioFormat(Uint8 * dst, const Uint8 * src, SDL_AudioFormat format,
|
||||||
|
|
||||||
case AUDIO_S16MSB:
|
case AUDIO_S16MSB:
|
||||||
{
|
{
|
||||||
#if defined(__GNUC__) && defined(__M68000__) && !defined(__mcoldfire__) && defined(SDL_ASSEMBLY_ROUTINES)
|
|
||||||
SDL_MixAudio_m68k_S16MSB((short *) dst, (short *) src,
|
|
||||||
(unsigned long) len, (long) volume);
|
|
||||||
#else
|
|
||||||
Sint16 src1, src2;
|
Sint16 src1, src2;
|
||||||
int dst_sample;
|
int dst_sample;
|
||||||
const int max_audioval = ((1 << (16 - 1)) - 1);
|
const int max_audioval = ((1 << (16 - 1)) - 1);
|
||||||
|
@ -198,7 +188,6 @@ SDL_MixAudioFormat(Uint8 * dst, const Uint8 * src, SDL_AudioFormat format,
|
||||||
dst[0] = dst_sample & 0xFF;
|
dst[0] = dst_sample & 0xFF;
|
||||||
dst += 2;
|
dst += 2;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue