Move music load functions from resourcemanager into separate file.

7 files changed, 134 insertions, 52 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 62bf23cd1..c9ee566af 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -719,6 +719,8 @@ SET(SRCS
     resources/db/skillunitdb.h
     resources/resource.cpp
     resources/resource.h
+    resources/loaders/musicloader.cpp
+    resources/loaders/musicloader.h
     resources/resourcemanager/resourcemanager.cpp
     resources/resourcemanager/resourcemanager.h
     resources/safeopenglimagehelper.cpp
@@ -1409,6 +1411,8 @@ SET(DYE_CMD_SRCS
     resources/imagewriter.h
     resources/resource.cpp
     resources/resource.h
+    resources/loaders/musicloader.cpp
+    resources/loaders/musicloader.h
     resources/resourcemanager/resourcemanager.cpp
     resources/resourcemanager/resourcemanager.h
     resources/sdl2softwareimagehelper.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 720dd1c1d..1ebcef7fd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -390,6 +390,8 @@ SRC += events/actionevent.h \
 	      enums/resources/questtype.h \
 	      resources/resource.cpp \
 	      resources/resource.h \
+	      resources/loaders/musicloader.cpp \
+	      resources/loaders/musicloader.h \
 	      resources/resourcemanager/resourcemanager.cpp \
 	      resources/resourcemanager/resourcemanager.h \
 	      resources/safeopenglimagehelper.cpp \
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
diff --git a/src/resources/resourcemanager/resourcemanager.cpp b/src/resources/resourcemanager/resourcemanager.cpp
index c59b09618..abec23475 100644
--- a/src/resources/resourcemanager/resourcemanager.cpp
+++ b/src/resources/resourcemanager/resourcemanager.cpp
@@ -527,42 +527,6 @@ Resource *ResourceManager::get(const std::string &idPath,
     return resource;
 }
 
-struct ResourceLoader final
-{
-    ResourceManager *manager;
-    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;
-    }
-};
-
-SDLMusic *ResourceManager::getMusic(const std::string &idPath)
-{
-    ResourceLoader rl = { this, idPath, &SDLMusic::load };
-    return static_cast<SDLMusic*>(get(idPath, ResourceLoader::load, &rl));
-}
-
-SoundEffect *ResourceManager::getSoundEffect(const std::string &idPath)
-{
-    ResourceLoader rl = { this, idPath, &SoundEffect::load };
-    return static_cast<SoundEffect*>(get(idPath, ResourceLoader::load, &rl));
-}
-
 struct DyedImageLoader final
 {
     ResourceManager *manager;
diff --git a/src/resources/resourcemanager/resourcemanager.h b/src/resources/resourcemanager/resourcemanager.h
index 2c2caabce..613934f91 100644
--- a/src/resources/resourcemanager/resourcemanager.h
+++ b/src/resources/resourcemanager/resourcemanager.h
@@ -140,18 +140,6 @@ class ResourceManager final : public MemoryCounter
         Image *getImage(const std::string &idPath) A_WARN_UNUSED;
 
         /**
-         * 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;
-
-        /**
          * Creates a image set based on the image referenced by the given
          * path and the supplied sprite sizes
          */
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());