summaryrefslogtreecommitdiff
path: root/src/soundmanager.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-05-24 23:43:33 +0300
committerAndrei Karas <akaras@inbox.ru>2016-05-24 23:49:11 +0300
commit59271755dc75f5de6c288308df92f687deaa32b4 (patch)
tree3be45c4fde11ee189c25ae69d52a661af096cb99 /src/soundmanager.cpp
parentd0a3a9f0f6dd3571e9f3a15bf4f8493a46d69eef (diff)
downloadmv-59271755dc75f5de6c288308df92f687deaa32b4.tar.gz
mv-59271755dc75f5de6c288308df92f687deaa32b4.tar.bz2
mv-59271755dc75f5de6c288308df92f687deaa32b4.tar.xz
mv-59271755dc75f5de6c288308df92f687deaa32b4.zip
Move music load functions from resourcemanager into separate file.
Diffstat (limited to 'src/soundmanager.cpp')
-rw-r--r--src/soundmanager.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/soundmanager.cpp b/src/soundmanager.cpp
index b48923d2f..1ae9cb0a6 100644
--- a/src/soundmanager.cpp
+++ b/src/soundmanager.cpp
@@ -32,7 +32,7 @@
#include "resources/sdlmusic.h"
#include "resources/soundeffect.h"
-#include "resources/resourcemanager/resourcemanager.h"
+#include "resources/loaders/musicloader.h"
#include "utils/checkutils.h"
#include "utils/physfstools.h"
@@ -330,7 +330,7 @@ static SDLMusic *loadMusic(const std::string &fileName,
reportAlways("Music file not found: %s", fileName.c_str());
return nullptr;
}
- return resourceManager->getMusic(path);
+ return MusicLoader::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 = resourceManager->getSoundEffect(tmpPath);
+ SoundEffect *const sample = MusicLoader::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 = resourceManager->getSoundEffect(tmpPath);
+ SoundEffect *const sample = MusicLoader::getSoundEffect(tmpPath);
if (sample)
{
logger->log("SoundManager::playGuiSfx() Playing: %s", path.c_str());