Refactor: Continued splitting up ClientResources

A couple of methods not specific to the client moved to libdoomsday.
skyjake · Jul 29, 2016 · f9aafa5 · f9aafa5
1 parent f28763c
commit f9aafa5
Show file tree

Hide file tree

Showing 10 changed files with 550 additions and 546 deletions.
diff --git a/doomsday/apps/client/include/resource/clientresources.h b/doomsday/apps/client/include/resource/clientresources.h
@@ -117,8 +117,6 @@ class ClientResources : public Resources
 
     void addColorPalette(res::ColorPalette &newPalette, de::String const &name);
 
-    patchid_t declarePatch(de::String encodedName);
-
 #ifdef __CLIENT__
 
     /**
@@ -423,18 +421,6 @@ class ClientResources : public Resources
 
 #endif // __CLIENT__
 
-    /**
-     * Attempt to locate a music file referenced in the given @em Music @a definition. Songs
-     * can be either in external files or non-MUS lumps.
-     *
-     * @note Lump based music is presently handled separately!!
-     *
-     * @param musicDef  Music definition to find the music file for.
-     *
-     * @return  Absolute path to the music if found; otherwise a zero-length string.
-     */
-    de::String tryFindMusicFile(de::Record const &musicDef);
-
 public:  /// @todo Should be private:
     void initTextures();
     void initSystemTextures();
@@ -447,10 +433,12 @@ class ClientResources : public Resources
     void pruneUnusedTextureSpecs();
 
 public:
+#ifdef __CLIENT__
     /**
      * Register the console commands, variables, etc..., of this module.
      */
     static void consoleRegister();
+#endif
 
 private:
     DENG2_PRIVATE(d)

diff --git a/doomsday/apps/client/src/render/r_draw.cpp b/doomsday/apps/client/src/render/r_draw.cpp
@@ -62,7 +62,7 @@ static void loadViewBorderPatches()
     borderPatches[0] = 0;
     for(uint i = 1; i < 9; ++i)
     {
-        borderPatches[i] = ClientResources::get().declarePatch(borderGraphicsNames[i]->path());
+        borderPatches[i] = res::Textures::get().declarePatch(borderGraphicsNames[i]->path());
     }
 
     // Detemine the view border size.

diff --git a/doomsday/apps/client/src/resource/base/api_resource.cpp b/doomsday/apps/client/src/resource/base/api_resource.cpp
@@ -319,7 +319,7 @@ DENG_EXTERN_C uri_s *R_ComposePatchUri(patchid_t id)
 #undef R_DeclarePatch
 DENG_EXTERN_C patchid_t R_DeclarePatch(char const *encodedName)
 {
-    return App_ResourceSystem().declarePatch(encodedName);
+    return res::Textures::get().declarePatch(encodedName);
 }
 
 #undef R_GetPatchInfo