Skip to content

Prefer native WAV decoding before SDL_sound #2066

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Tutez64 wants to merge 1 commit into
base: develop
Choose a base branch
from
+16 −17
Open

Prefer native WAV decoding before SDL_sound #2066

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 16 additions & 17 deletions project/src/ExternalInterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand All @@ -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)) {
Expand All @@ -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)) {
Expand All @@ -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)) {
Expand Down