summaryrefslogtreecommitdiff
path: root/src/resources/resourcemanager.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-12-03 16:52:15 +0300
committerAndrei Karas <akaras@inbox.ru>2012-12-03 16:55:25 +0300
commitaa1e8a7a7236d49d91501eac2da81bdb96f0bba5 (patch)
tree833744617232b18ae86aa108dddc72dad8381360 /src/resources/resourcemanager.h
parentd69ea30539a6fe816dd6e1d943a0a2adcbd95c19 (diff)
downloadmanaplus-aa1e8a7a7236d49d91501eac2da81bdb96f0bba5.tar.gz
manaplus-aa1e8a7a7236d49d91501eac2da81bdb96f0bba5.tar.bz2
manaplus-aa1e8a7a7236d49d91501eac2da81bdb96f0bba5.tar.xz
manaplus-aa1e8a7a7236d49d91501eac2da81bdb96f0bba5.zip
Rename music.cpp/h to sdlmusic.
Diffstat (limited to 'src/resources/resourcemanager.h')
-rw-r--r--src/resources/resourcemanager.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h
index 220c5f3f3..d08f8043c 100644
--- a/src/resources/resourcemanager.h
+++ b/src/resources/resourcemanager.h
@@ -37,7 +37,7 @@
class AnimationDelayLoad;
class Image;
class ImageSet;
-class Music;
+class SDLMusic;
class Resource;
class SoundEffect;
class SpriteDef;
@@ -195,7 +195,7 @@ class ResourceManager final
* Convenience wrapper around ResourceManager::get for loading
* songs.
*/
- Music *getMusic(const std::string &idPath) A_WARN_UNUSED;
+ SDLMusic *getMusic(const std::string &idPath) A_WARN_UNUSED;
/**
* Convenience wrapper around ResourceManager::get for loading