summaryrefslogtreecommitdiff
path: root/src/resources/music.h
diff options
context:
space:
mode:
authorGuillaume Melquiond <guillaume.melquiond@gmail.com>2007-10-19 17:46:46 +0000
committerGuillaume Melquiond <guillaume.melquiond@gmail.com>2007-10-19 17:46:46 +0000
commit41cf359468d6379bc0e033bee9ac148d1b9255dd (patch)
treed351692d76e861607fd504366ae22374613b0fec /src/resources/music.h
parentc3e36e443698b001e98219e48cc97e259ada0a1d (diff)
downloadmana-41cf359468d6379bc0e033bee9ac148d1b9255dd.tar.gz
mana-41cf359468d6379bc0e033bee9ac148d1b9255dd.tar.bz2
mana-41cf359468d6379bc0e033bee9ac148d1b9255dd.tar.xz
mana-41cf359468d6379bc0e033bee9ac148d1b9255dd.zip
Factored code between resource handlers. Implemented failure-friendly sprite loader.
Diffstat (limited to 'src/resources/music.h')
-rw-r--r--src/resources/music.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/resources/music.h b/src/resources/music.h
index 2888eaa0..72e76295 100644
--- a/src/resources/music.h
+++ b/src/resources/music.h
@@ -40,17 +40,15 @@ class Music : public Resource
virtual ~Music();
/**
- * Loads an image from a buffer in memory.
+ * Loads a music from a buffer in memory.
*
* @param buffer The memory buffer containing the music data.
* @param bufferSize The size of the memory buffer in bytes.
- * @param idPath The path identifying the resource.
*
* @return <code>NULL</code> if the an error occurred, a valid pointer
* otherwise.
*/
- static Music*
- load(void* buffer, unsigned int bufferSize, const std::string &idPath);
+ static Resource *load(void *buffer, unsigned bufferSize);
/**
* Plays the music.
@@ -73,7 +71,7 @@ class Music : public Resource
/**
* Constructor.
*/
- Music(const std::string &idPath, Mix_Chunk *music);
+ Music(Mix_Chunk *music);
//Mix_Music *music;
Mix_Chunk *mChunk;