diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-05-25 19:32:59 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-05-25 19:32:59 +0300 |
commit | 1b1a7cea1c6b81438bacc86b93cb80a78430790f (patch) | |
tree | d23f4e0beea6b4e5c570afafd9ad9de6b68ba812 /src/soundmanager.cpp | |
parent | bb8be1acea37f09c134d7d4042869a679cf8a12b (diff) | |
download | manaplus-1b1a7cea1c6b81438bacc86b93cb80a78430790f.tar.gz manaplus-1b1a7cea1c6b81438bacc86b93cb80a78430790f.tar.bz2 manaplus-1b1a7cea1c6b81438bacc86b93cb80a78430790f.tar.xz manaplus-1b1a7cea1c6b81438bacc86b93cb80a78430790f.zip |
Change namespace in resources loaders from other to Loader.
Diffstat (limited to 'src/soundmanager.cpp')
-rw-r--r-- | src/soundmanager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/soundmanager.cpp b/src/soundmanager.cpp index 1ae9cb0a6..004cfacdf 100644 --- a/src/soundmanager.cpp +++ b/src/soundmanager.cpp @@ -330,7 +330,7 @@ static SDLMusic *loadMusic(const std::string &fileName, reportAlways("Music file not found: %s", fileName.c_str()); return nullptr; } - return MusicLoader::getMusic(path); + return Loader::getMusic(path); } void SoundManager::playMusic(const std::string &fileName, @@ -455,7 +455,7 @@ void SoundManager::playSfx(const std::string &path, tmpPath = path; else tmpPath = paths.getValue("sfx", "sfx/").append(path); - SoundEffect *const sample = MusicLoader::getSoundEffect(tmpPath); + SoundEffect *const sample = Loader::getSoundEffect(tmpPath); if (sample) { logger->log("SoundManager::playSfx() Playing: %s", path.c_str()); @@ -497,7 +497,7 @@ void SoundManager::playGuiSfx(const std::string &path) tmpPath = path; else tmpPath = paths.getValue("sfx", "sfx/").append(path); - SoundEffect *const sample = MusicLoader::getSoundEffect(tmpPath); + SoundEffect *const sample = Loader::getSoundEffect(tmpPath); if (sample) { logger->log("SoundManager::playGuiSfx() Playing: %s", path.c_str()); |