diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-05-24 23:43:33 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-05-24 23:49:11 +0300 |
commit | 59271755dc75f5de6c288308df92f687deaa32b4 (patch) | |
tree | 3be45c4fde11ee189c25ae69d52a661af096cb99 /src/resources/loaders | |
parent | d0a3a9f0f6dd3571e9f3a15bf4f8493a46d69eef (diff) | |
download | manaverse-59271755dc75f5de6c288308df92f687deaa32b4.tar.gz manaverse-59271755dc75f5de6c288308df92f687deaa32b4.tar.bz2 manaverse-59271755dc75f5de6c288308df92f687deaa32b4.tar.xz manaverse-59271755dc75f5de6c288308df92f687deaa32b4.zip |
Move music load functions from resourcemanager into separate file.
Diffstat (limited to 'src/resources/loaders')
-rw-r--r-- | src/resources/loaders/musicloader.cpp | 75 | ||||
-rw-r--r-- | src/resources/loaders/musicloader.h | 49 |
2 files changed, 124 insertions, 0 deletions
diff --git a/src/resources/loaders/musicloader.cpp b/src/resources/loaders/musicloader.cpp new file mode 100644 index 000000000..0b47cc269 --- /dev/null +++ b/src/resources/loaders/musicloader.cpp @@ -0,0 +1,75 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2016 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include "logger.h" + +#include "resources/sdlmusic.h" +#include "resources/soundeffect.h" + +#include "resources/loaders/musicloader.h" + +#include "resources/resourcemanager/resourcemanager.h" + +#include "utils/checkutils.h" +#include "utils/physfsrwops.h" + +#include "debug.h" + +namespace +{ + struct ResourceLoader final + { + std::string path; + ResourceManager::loader fun; + + static Resource *load(const void *const v) + { + if (!v) + return nullptr; + const ResourceLoader *const + rl = static_cast<const ResourceLoader *const>(v); + SDL_RWops *const rw = MPHYSFSRWOPS_openRead(rl->path.c_str()); + if (!rw) + { + reportAlways("Error loading resource: %s", + rl->path.c_str()); + return nullptr; + } + Resource *const res = rl->fun(rw, rl->path); + return res; + } + }; +} // namespace + +SDLMusic *MusicLoader::getMusic(const std::string &idPath) +{ + ResourceLoader rl = { idPath, &SDLMusic::load }; + return static_cast<SDLMusic*>(resourceManager->get( + idPath, ResourceLoader::load, &rl)); +} + +SoundEffect *MusicLoader::getSoundEffect(const std::string &idPath) +{ + ResourceLoader rl = { idPath, &SoundEffect::load }; + return static_cast<SoundEffect*>(resourceManager->get( + idPath, ResourceLoader::load, &rl)); +} diff --git a/src/resources/loaders/musicloader.h b/src/resources/loaders/musicloader.h new file mode 100644 index 000000000..0d005414f --- /dev/null +++ b/src/resources/loaders/musicloader.h @@ -0,0 +1,49 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2016 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef RESOURCES_RESOURCEMANAGER_MUSICLOADER_H +#define RESOURCES_RESOURCEMANAGER_MUSICLOADER_H + +#include "localconsts.h" + +#include <string> + +class SDLMusic; +class Resource; +class SoundEffect; + +namespace MusicLoader +{ + /** + * Convenience wrapper around ResourceManager::get for loading + * songs. + */ + SDLMusic *getMusic(const std::string &idPath) A_WARN_UNUSED; + + /** + * Convenience wrapper around ResourceManager::get for loading + * samples. + */ + SoundEffect *getSoundEffect(const std::string &idPath) A_WARN_UNUSED; +} + +#endif // RESOURCES_RESOURCEMANAGER_MUSICLOADER_H |