summaryrefslogtreecommitdiff
path: root/src/resources/sdlmusic.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-07-28 19:34:49 +0300
committerAndrei Karas <akaras@inbox.ru>2016-07-28 19:34:49 +0300
commit6b2264b7c5f2b1dba3360eb090ad1dd0052d7afb (patch)
tree16571caccd525266e2feda348d86adceaae830e5 /src/resources/sdlmusic.cpp
parent35d30efe7605c24765f5fdbe73a22626dc7c17c1 (diff)
downloadmanaplus-6b2264b7c5f2b1dba3360eb090ad1dd0052d7afb.tar.gz
manaplus-6b2264b7c5f2b1dba3360eb090ad1dd0052d7afb.tar.bz2
manaplus-6b2264b7c5f2b1dba3360eb090ad1dd0052d7afb.tar.xz
manaplus-6b2264b7c5f2b1dba3360eb090ad1dd0052d7afb.zip
Move sdlmusic load code into musicloader.
Diffstat (limited to 'src/resources/sdlmusic.cpp')
-rw-r--r--src/resources/sdlmusic.cpp22
1 files changed, 0 insertions, 22 deletions
diff --git a/src/resources/sdlmusic.cpp b/src/resources/sdlmusic.cpp
index 5834e8b49..7ff8537e9 100644
--- a/src/resources/sdlmusic.cpp
+++ b/src/resources/sdlmusic.cpp
@@ -48,28 +48,6 @@ SDLMusic::~SDLMusic()
#endif
}
-Resource *SDLMusic::load(SDL_RWops *const rw,
- const std::string &name)
-{
-#ifdef USE_SDL2
- if (Mix_Music *const music = Mix_LoadMUSType_RW(rw, MUS_OGG, 1))
- {
- return new SDLMusic(music, nullptr, name);
- }
-#else
- // 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, name);
- }
-#endif
- else
- {
- logger->log("Error, failed to load music: %s", Mix_GetError());
- return nullptr;
- }
-}
-
bool SDLMusic::play(const int loops, const int fadeIn)
{
if (fadeIn > 0)