summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-10-25 23:54:03 +0300
committerAndrei Karas <akaras@inbox.ru>2017-10-25 23:54:03 +0300
commit03378679c6e7b5833ddca59d9aacc22a22f7654c (patch)
treefd3849e22cc1a6fc3e8858a0e530122a94ddd281 /src/resources
parentc1090f81650347ef03a1d50783f8b77b02646f9e (diff)
downloadmv-03378679c6e7b5833ddca59d9aacc22a22f7654c.tar.gz
mv-03378679c6e7b5833ddca59d9aacc22a22f7654c.tar.bz2
mv-03378679c6e7b5833ddca59d9aacc22a22f7654c.tar.xz
mv-03378679c6e7b5833ddca59d9aacc22a22f7654c.zip
Add sdlmusichelper with some SDL/SDL2 functions.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/loaders/musicloader.cpp11
-rw-r--r--src/resources/soundeffect.cpp2
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