From 41cf359468d6379bc0e033bee9ac148d1b9255dd Mon Sep 17 00:00:00 2001
From: Guillaume Melquiond <guillaume.melquiond@gmail.com>
Date: Fri, 19 Oct 2007 17:46:46 +0000
Subject: Factored code between resource handlers. Implemented failure-friendly
 sprite loader.

---
 src/resources/music.h | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/resources/music.h')

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;
-- 
cgit v1.2.3-70-g09d2