From 6b2264b7c5f2b1dba3360eb090ad1dd0052d7afb Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 28 Jul 2016 19:34:49 +0300 Subject: Move sdlmusic load code into musicloader. --- src/resources/sdlmusic.h | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) (limited to 'src/resources/sdlmusic.h') diff --git a/src/resources/sdlmusic.h b/src/resources/sdlmusic.h index 007a6acf1..86eacc044 100644 --- a/src/resources/sdlmusic.h +++ b/src/resources/sdlmusic.h @@ -42,6 +42,10 @@ class SDLMusic final : public Resource mRw(nullptr) { } + SDLMusic(Mix_Music *const music, + SDL_RWops *const rw, + const std::string &name); + A_DELETE_COPY(SDLMusic) /** @@ -49,17 +53,6 @@ class SDLMusic final : public Resource */ ~SDLMusic(); - /** - * Loads a music from a buffer in memory. - * - * @param rw The SDL_RWops to load the music data from. - * - * @return NULL if the an error occurred, a valid pointer - * otherwise. - */ - static Resource *load(SDL_RWops *const rw, - const std::string &name) A_WARN_UNUSED; - /** * Plays the music. * @@ -78,13 +71,6 @@ class SDLMusic final : public Resource { return mName; } protected: - /** - * Constructor. - */ - SDLMusic(Mix_Music *const music, - SDL_RWops *const rw, - const std::string &name); - std::string mName; Mix_Music *mMusic; SDL_RWops *mRw; -- cgit v1.2.3-70-g09d2