diff options
author | Andrei Karas <akaras@inbox.ru> | 2017-10-25 23:54:03 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2017-10-25 23:54:03 +0300 |
commit | 03378679c6e7b5833ddca59d9aacc22a22f7654c (patch) | |
tree | fd3849e22cc1a6fc3e8858a0e530122a94ddd281 /src/resources/loaders | |
parent | c1090f81650347ef03a1d50783f8b77b02646f9e (diff) | |
download | manaplus-03378679c6e7b5833ddca59d9aacc22a22f7654c.tar.gz manaplus-03378679c6e7b5833ddca59d9aacc22a22f7654c.tar.bz2 manaplus-03378679c6e7b5833ddca59d9aacc22a22f7654c.tar.xz manaplus-03378679c6e7b5833ddca59d9aacc22a22f7654c.zip |
Add sdlmusichelper with some SDL/SDL2 functions.
Diffstat (limited to 'src/resources/loaders')
-rw-r--r-- | src/resources/loaders/musicloader.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/resources/loaders/musicloader.cpp b/src/resources/loaders/musicloader.cpp index 7ac151c12..01fa55cc6 100644 --- a/src/resources/loaders/musicloader.cpp +++ b/src/resources/loaders/musicloader.cpp @@ -29,6 +29,7 @@ #include "resources/resourcemanager/resourcemanager.h" #include "utils/checkutils.h" +#include "utils/sdlmusichelper.h" #include "debug.h" @@ -53,19 +54,15 @@ namespace rl->path.c_str()); return nullptr; } -#ifdef USE_SDL2 - if (Mix_Music *const music = Mix_LoadMUSType_RW(rw, MUS_OGG, 1)) + if (Mix_Music *const music = SDL::LoadMUSOgg_RW(rw)) { +#ifdef USE_SDL2 return new SDLMusic(music, nullptr, rl->path); - } #else // USE_SDL2 - // Mix_LoadMUSType_RW was added without version changed in SDL1.2 :( - if (Mix_Music *const music = Mix_LoadMUS_RW(rw)) - { return new SDLMusic(music, rw, rl->path); - } #endif // USE_SDL2 + } logger->log("Error, failed to load music: %s", SDL_GetError()); return nullptr; |