summaryrefslogtreecommitdiff
path: root/src/resources/sdlmusic.h
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.h
parent35d30efe7605c24765f5fdbe73a22626dc7c17c1 (diff)
downloadmv-6b2264b7c5f2b1dba3360eb090ad1dd0052d7afb.tar.gz
mv-6b2264b7c5f2b1dba3360eb090ad1dd0052d7afb.tar.bz2
mv-6b2264b7c5f2b1dba3360eb090ad1dd0052d7afb.tar.xz
mv-6b2264b7c5f2b1dba3360eb090ad1dd0052d7afb.zip
Move sdlmusic load code into musicloader.
Diffstat (limited to 'src/resources/sdlmusic.h')
-rw-r--r--src/resources/sdlmusic.h22
1 files changed, 4 insertions, 18 deletions
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)
/**
@@ -50,17 +54,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 <code>NULL</code> 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.
*
* @param loops Number of times to repeat the playback (-1 means
@@ -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;