diff options
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/resources/loaders/musicloader.cpp | 8 | ||||
| -rw-r--r-- | src/resources/loaders/musicloader.h | 7 | ||||
| -rw-r--r-- | src/resources/loaders/soundloader.cpp | 65 | ||||
| -rw-r--r-- | src/resources/loaders/soundloader.h | 41 | ||||
| -rw-r--r-- | src/soundmanager.cpp | 1 |
7 files changed, 111 insertions, 15 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d8a6510be..587603771 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -746,6 +746,8 @@ SET(SRCS resources/loaders/shaderloader.h resources/loaders/shaderprogramloader.cpp resources/loaders/shaderprogramloader.h + resources/loaders/soundloader.cpp + resources/loaders/soundloader.h resources/loaders/spritedefloader.cpp resources/loaders/spritedefloader.h resources/loaders/subimageloader.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 136e62871..d0bd729ea 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -411,6 +411,8 @@ SRC += events/actionevent.h \ resources/loaders/shaderloader.h \ resources/loaders/shaderprogramloader.cpp \ resources/loaders/shaderprogramloader.h \ + resources/loaders/soundloader.cpp \ + resources/loaders/soundloader.h \ resources/loaders/spritedefloader.cpp \ resources/loaders/spritedefloader.h \ resources/loaders/subimageloader.cpp \ diff --git a/src/resources/loaders/musicloader.cpp b/src/resources/loaders/musicloader.cpp index 837befcf9..49ef40ef0 100644 --- a/src/resources/loaders/musicloader.cpp +++ b/src/resources/loaders/musicloader.cpp @@ -21,7 +21,6 @@ */ #include "resources/sdlmusic.h" -#include "resources/soundeffect.h" #include "resources/loaders/musicloader.h" @@ -64,10 +63,3 @@ SDLMusic *Loader::getMusic(const std::string &idPath) return static_cast<SDLMusic*>(resourceManager->get( idPath, ResourceLoader::load, &rl)); } - -SoundEffect *Loader::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 index 233fe9a03..678758f74 100644 --- a/src/resources/loaders/musicloader.h +++ b/src/resources/loaders/musicloader.h @@ -27,7 +27,6 @@ #include <string> -class SDLMusic; class Resource; class SoundEffect; @@ -38,12 +37,6 @@ namespace Loader * 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; } // namespace Loader #endif // RESOURCES_RESOURCEMANAGER_MUSICLOADER_H diff --git a/src/resources/loaders/soundloader.cpp b/src/resources/loaders/soundloader.cpp new file mode 100644 index 000000000..b39c5fcbe --- /dev/null +++ b/src/resources/loaders/soundloader.cpp @@ -0,0 +1,65 @@ +/* + * 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 "resources/soundeffect.h" + +#include "resources/loaders/soundloader.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 + +SoundEffect *Loader::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/soundloader.h b/src/resources/loaders/soundloader.h new file mode 100644 index 000000000..789fc7180 --- /dev/null +++ b/src/resources/loaders/soundloader.h @@ -0,0 +1,41 @@ +/* + * 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_SOUNDLOADER_H +#define RESOURCES_RESOURCEMANAGER_SOUNDLOADER_H + +#include "localconsts.h" + +#include <string> + +class SoundEffect; + +namespace Loader +{ + /** + * Convenience wrapper around ResourceManager::get for loading + * samples. + */ + SoundEffect *getSoundEffect(const std::string &idPath) A_WARN_UNUSED; +} // namespace Loader + +#endif // RESOURCES_RESOURCEMANAGER_SOUNDLOADER_H diff --git a/src/soundmanager.cpp b/src/soundmanager.cpp index 88b2db2d0..8ee6f2a26 100644 --- a/src/soundmanager.cpp +++ b/src/soundmanager.cpp @@ -32,6 +32,7 @@ #include "resources/soundeffect.h" #include "resources/loaders/musicloader.h" +#include "resources/loaders/soundloader.h" #include "utils/checkutils.h" #include "utils/physfstools.h" |