diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-12-03 16:52:15 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-12-03 16:55:25 +0300 |
| commit | aa1e8a7a7236d49d91501eac2da81bdb96f0bba5 (patch) | |
| tree | 833744617232b18ae86aa108dddc72dad8381360 /src/resources/resourcemanager.cpp | |
| parent | d69ea30539a6fe816dd6e1d943a0a2adcbd95c19 (diff) | |
| download | manaplus-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.cpp')
| -rw-r--r-- | src/resources/resourcemanager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp index 6779419f1..20cd37587 100644 --- a/src/resources/resourcemanager.cpp +++ b/src/resources/resourcemanager.cpp @@ -32,7 +32,7 @@ #include "resources/image.h" #include "resources/imagehelper.h" #include "resources/imageset.h" -#include "resources/music.h" +#include "resources/sdlmusic.h" #include "resources/openglimagehelper.h" #include "resources/soundeffect.h" #include "resources/spritedef.h" @@ -549,9 +549,9 @@ Resource *ResourceManager::load(const std::string &path, const loader fun) return get(path, ResourceLoader::load, &rl); } -Music *ResourceManager::getMusic(const std::string &idPath) +SDLMusic *ResourceManager::getMusic(const std::string &idPath) { - return static_cast<Music*>(load(idPath, Music::load)); + return static_cast<SDLMusic*>(load(idPath, SDLMusic::load)); } SoundEffect *ResourceManager::getSoundEffect(const std::string &idPath) |