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/sound.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/sound.cpp')
| -rw-r--r-- | src/sound.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sound.cpp b/src/sound.cpp index 82e7b2f6d..a316abc9d 100644 --- a/src/sound.cpp +++ b/src/sound.cpp @@ -25,7 +25,7 @@ #include "configuration.h" #include "localplayer.h" -#include "resources/music.h" +#include "resources/sdlmusic.h" #include "resources/resourcemanager.h" #include "resources/soundeffect.h" @@ -211,7 +211,7 @@ void Sound::setSfxVolume(const int volume) Mix_Volume(-1, mSfxVolume); } -static Music *loadMusic(const std::string &fileName) +static SDLMusic *loadMusic(const std::string &fileName) { ResourceManager *const resman = ResourceManager::getInstance(); return resman->getMusic(paths.getStringValue("music") + fileName); |