From fe8ec704268c2ad00eca428a77efe0410cf92403 Mon Sep 17 00:00:00 2001 From: Wohlstand Date: Sat, 12 Nov 2022 18:59:45 +0300 Subject: MidiPlay: Always use the system byte order --- utils/midiplay/audio_sdl.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) (limited to 'utils/midiplay/audio_sdl.c') diff --git a/utils/midiplay/audio_sdl.c b/utils/midiplay/audio_sdl.c index 4845cf0..b520ef3 100644 --- a/utils/midiplay/audio_sdl.c +++ b/utils/midiplay/audio_sdl.c @@ -46,13 +46,33 @@ int audio_init(struct AudioOutputSpec *in_spec, struct AudioOutputSpec *out_obta case ADLMIDI_SampleType_U8: spec.format = AUDIO_U8; break; case ADLMIDI_SampleType_S16: - spec.format = in_spec->is_msb ? AUDIO_S16MSB : AUDIO_S16; break; +#if SDL_BYTEORDER == SDL_LIL_ENDIAN + spec.format = AUDIO_S16; +#else + spec.format = AUDIO_S16MSB; +#endif + break; case ADLMIDI_SampleType_U16: - spec.format = in_spec->is_msb ? AUDIO_U16MSB : AUDIO_U16; break; +#if SDL_BYTEORDER == SDL_LIL_ENDIAN + spec.format = AUDIO_U16; +#else + spec.format = AUDIO_U16MSB; +#endif + break; case ADLMIDI_SampleType_S32: - spec.format = in_spec->is_msb ? AUDIO_S32MSB : AUDIO_S32; break; +#if SDL_BYTEORDER == SDL_LIL_ENDIAN + spec.format = AUDIO_S32; +#else + spec.format = AUDIO_S32MSB; +#endif + break; case ADLMIDI_SampleType_F32: - spec.format = in_spec->is_msb ? AUDIO_F32MSB : AUDIO_F32; break; +#if SDL_BYTEORDER == SDL_LIL_ENDIAN + spec.format = AUDIO_F32; +#else + spec.format = AUDIO_F32MSB; +#endif + break; } ret = SDL_OpenAudio(&spec, &obtained); -- cgit v1.2.3