From aa1e8a7a7236d49d91501eac2da81bdb96f0bba5 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 3 Dec 2012 16:52:15 +0300 Subject: Rename music.cpp/h to sdlmusic. --- src/resources/resourcemanager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/resources/resourcemanager.cpp') 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(load(idPath, Music::load)); + return static_cast(load(idPath, SDLMusic::load)); } SoundEffect *ResourceManager::getSoundEffect(const std::string &idPath) -- cgit v1.2.3-70-g09d2