Merge pull request #1655 from OutpostUniverse/splitCache

Split `Music` to separate cache file

Author: DanRStevens

appOPHD/Cache.h

@@ -2,13 +2,8 @@
 
 #include <NAS2D/Resource/Font.h>
 #include <NAS2D/Resource/Image.h>
-#include <NAS2D/Resource/Music.h>
 #include <NAS2D/Resource/ResourceCache.h>
 
-#include <memory>
-
 
 inline NAS2D::ResourceCache<NAS2D::Font, std::string, unsigned int> fontCache;
 inline NAS2D::ResourceCache<NAS2D::Image, std::string> imageCache;
-
-inline std::unique_ptr<NAS2D::Music> trackMars;

appOPHD/CacheMusic.h

@@ -0,0 +1,8 @@
+#pragma once
+
+#include <NAS2D/Resource/Music.h>
+
+#include <memory>
+
+
+inline std::unique_ptr<NAS2D::Music> trackMars;

appOPHD/States/MainMenuState.cpp

@@ -3,6 +3,7 @@
 #include "PlanetSelectState.h"
 
 #include "../Cache.h"
+#include "../CacheMusic.h"
 #include "../OpenSaveGame.h"
 #include "../Constants/Strings.h"
 #include "../Constants/UiConstants.h"

appOPHD/appOPHD.vcxproj

@@ -286,6 +286,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Cache.h" />
+    <ClInclude Include="CacheMusic.h" />
     <ClInclude Include="Constants\Numbers.h" />
     <ClInclude Include="Constants\Strings.h" />
     <ClInclude Include="Constants\UiConstants.h" />

appOPHD/appOPHD.vcxproj.filters

@@ -377,6 +377,9 @@
     <ClInclude Include="Cache.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="CacheMusic.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="Constants\Numbers.h">
       <Filter>Header Files\Constants</Filter>
     </ClInclude>

appOPHD/main.cpp

@@ -1,4 +1,5 @@
 #include "Cache.h"
+#include "CacheMusic.h"
 #include "Constants/Strings.h"
 #include "Constants/Numbers.h"
 #include "Constants/UiConstants.h"