From 442a2dd0a4417182cbdd9f9fefb45bda4914e3d7 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 28 Jul 2016 19:54:02 +0300 Subject: Move soundeffect load code into soundloader. --- src/resources/soundeffect.h | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) (limited to 'src/resources/soundeffect.h') diff --git a/src/resources/soundeffect.h b/src/resources/soundeffect.h index 20861f218..bc0a353f6 100644 --- a/src/resources/soundeffect.h +++ b/src/resources/soundeffect.h @@ -35,6 +35,16 @@ class SoundEffect final : public Resource { public: + /** + * Constructor. + */ + SoundEffect(Mix_Chunk *const soundEffect, + const std::string &name) : + Resource(), + mName(name), + mChunk(soundEffect) + { } + A_DELETE_COPY(SoundEffect) /** @@ -42,17 +52,6 @@ class SoundEffect final : public Resource */ ~SoundEffect(); - /** - * Loads a sample from a buffer in memory. - * - * @param rw The SDL_RWops to load the sample data from. - * - * @return NULL if the an error occurred, a valid pointer - * otherwise. - */ - static Resource *load(SDL_RWops *const rw, - const std::string &name); - /** * Plays the sample. * @@ -72,16 +71,6 @@ class SoundEffect final : public Resource { return mName; } protected: - /** - * Constructor. - */ - SoundEffect(Mix_Chunk *const soundEffect, - const std::string &name) : - Resource(), - mName(name), - mChunk(soundEffect) - { } - std::string mName; Mix_Chunk *mChunk; }; -- cgit v1.2.3-70-g09d2