Add sdlmusichelper with some SDL/SDL2 functions.

2 files changed, 5 insertions, 8 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;
diff --git a/src/resources/soundeffect.cpp b/src/resources/soundeffect.cpp
index db7c5d462..55a48abd0 100644
--- a/src/resources/soundeffect.cpp
+++ b/src/resources/soundeffect.cpp
@@ -34,7 +34,7 @@ bool SoundEffect::play(const int loops, const int volume,
 {
     Mix_VolumeChunk(mChunk, volume);
 
-    return Mix_PlayChannel(channel, mChunk, loops) != -1;
+    return Mix_PlayChannelTimed(channel, mChunk, loops, -1) != -1;
 }
 
 int SoundEffect::calcMemoryLocal() const