From 03378679c6e7b5833ddca59d9aacc22a22f7654c Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 25 Oct 2017 23:54:03 +0300 Subject: Add sdlmusichelper with some SDL/SDL2 functions. --- src/resources/loaders/musicloader.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/resources/loaders') 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; -- cgit v1.2.3-60-g2f50