diff --git a/project/src/ExternalInterface.cpp b/project/src/ExternalInterface.cpp index 0fcb20e6e7..c48859613d 100644 --- a/project/src/ExternalInterface.cpp +++ b/project/src/ExternalInterface.cpp @@ -423,20 +423,19 @@ namespace lime { bytes.Set (data); resource = Resource (&bytes); - #ifdef LIME_SDL_SOUND - if (SDLSound::Decode (&resource, &audioBuffer)) { + if (WAV::Decode (&resource, &audioBuffer)) { return audioBuffer.Value (buffer); } - #endif - - if (WAV::Decode (&resource, &audioBuffer)) { + #ifdef LIME_SDL_SOUND + if (SDLSound::Decode (&resource, &audioBuffer)) { return audioBuffer.Value (buffer); } + #endif #ifdef LIME_OGG if (OGG::Decode (&resource, &audioBuffer)) { @@ -455,19 +454,19 @@ namespace lime { Resource resource = Resource (data); - #ifdef LIME_SDL_SOUND - if (SDLSound::Decode (&resource, buffer)) { + if (WAV::Decode (&resource, buffer)) { return buffer; } - #endif - if (WAV::Decode (&resource, buffer)) { + #ifdef LIME_SDL_SOUND + if (SDLSound::Decode (&resource, buffer)) { return buffer; } + #endif #ifdef LIME_OGG if (OGG::Decode (&resource, buffer)) { @@ -490,19 +489,19 @@ namespace lime { resource = Resource (val_string (data)); - #ifdef LIME_SDL_SOUND - if (SDLSound::Decode (&resource, &audioBuffer)) { + if (WAV::Decode (&resource, &audioBuffer)) { return audioBuffer.Value (buffer); } - #endif - if (WAV::Decode (&resource, &audioBuffer)) { + #ifdef LIME_SDL_SOUND + if (SDLSound::Decode (&resource, &audioBuffer)) { return audioBuffer.Value (buffer); } + #endif #ifdef LIME_OGG if (OGG::Decode (&resource, &audioBuffer)) { @@ -521,19 +520,19 @@ namespace lime { Resource resource = Resource (data ? hl_to_utf8 ((const uchar*)data->bytes) : NULL); - #ifdef LIME_SDL_SOUND - if (SDLSound::Decode (&resource, buffer)) { + if (WAV::Decode (&resource, buffer)) { return buffer; } - #endif - if (WAV::Decode (&resource, buffer)) { + #ifdef LIME_SDL_SOUND + if (SDLSound::Decode (&resource, buffer)) { return buffer; } + #endif #ifdef LIME_OGG if (OGG::Decode (&resource, buffer)) {