Revert "[hle] constexpr handler dispatch maps, introduce version gating (#4480)" (#4532)

This reverts commit 218c6705d950635bc18f8458d738a1996fb592b6.

- [x] I have read and followed the [Contribution Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/CONTRIBUTING.md#code-contributions).
- [x] I have read and followed the [AI Policy](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/AI.md).
- [x] I have read and followed the [Coding Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/Coding.md) to the best of my ability.

-------------------

Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4532
Reviewed-by: lizzie <lizzie@eden-emu.dev>
Reviewed-by: CamilleLaVey <camillelavey99@gmail.com>
Reviewed-by: Maufeat <sahyno1996@gmail.com>

1 files changed, 25 insertions, 25 deletions

diff --git a/src/core/hle/service/caps/caps_c.cpp b/src/core/hle/service/caps/caps_c.cpp
index c62c3cd5d3..6c9f8e964d 100644
--- a/src/core/hle/service/caps/caps_c.cpp
+++ b/src/core/hle/service/caps/caps_c.cpp
@@ -14,34 +14,34 @@
 
 namespace Service::Capture {
 
-std::optional<ServiceFrameworkBase::FunctionInfoBase> IAlbumControlService::FindRequest(u32 key) {
-    static constexpr auto functions = CreateStaticMap(
-        FunctionInfo{1, nullptr, "CaptureRawImage"},
-        FunctionInfo{2, nullptr, "CaptureRawImageWithTimeout"},
-        FunctionInfo{33, C<&IAlbumControlService::SetShimLibraryVersion>, "SetShimLibraryVersion"},
-        FunctionInfo{1001, nullptr, "RequestTakingScreenShot"},
-        FunctionInfo{1002, nullptr, "RequestTakingScreenShotWithTimeout"},
-        FunctionInfo{1011, nullptr, "NotifyTakingScreenShotRefused"},
-        FunctionInfo{2001, nullptr, "NotifyAlbumStorageIsAvailable"},
-        FunctionInfo{2002, nullptr, "NotifyAlbumStorageIsUnavailable"},
-        FunctionInfo{2011, nullptr, "RegisterAppletResourceUserId"},
-        FunctionInfo{2012, nullptr, "UnregisterAppletResourceUserId"},
-        FunctionInfo{2013, nullptr, "GetApplicationIdFromAruid"},
-        FunctionInfo{2014, nullptr, "CheckApplicationIdRegistered"},
-        FunctionInfo{2101, nullptr, "GenerateCurrentAlbumFileId"},
-        FunctionInfo{2102, nullptr, "GenerateApplicationAlbumEntry"},
-        FunctionInfo{2201, nullptr, "SaveAlbumScreenShotFile"},
-        FunctionInfo{2202, nullptr, "SaveAlbumScreenShotFileEx"},
-        FunctionInfo{2301, nullptr, "SetOverlayScreenShotThumbnailData"},
-        FunctionInfo{2302, nullptr, "SetOverlayMovieThumbnailData"},
-        FunctionInfo{60001, nullptr, "OpenControlSession"}
-    );
-    return HandlerTableGenerateWithFind(key, functions);
-}
-
 IAlbumControlService::IAlbumControlService(Core::System& system_,
                                            std::shared_ptr<AlbumManager> album_manager)
     : ServiceFramework{system_, "caps:c"}, manager{album_manager} {
+    // clang-format off
+    static const FunctionInfo functions[] = {
+        {1, nullptr, "CaptureRawImage"},
+        {2, nullptr, "CaptureRawImageWithTimeout"},
+        {33, C<&IAlbumControlService::SetShimLibraryVersion>, "SetShimLibraryVersion"},
+        {1001, nullptr, "RequestTakingScreenShot"},
+        {1002, nullptr, "RequestTakingScreenShotWithTimeout"},
+        {1011, nullptr, "NotifyTakingScreenShotRefused"},
+        {2001, nullptr, "NotifyAlbumStorageIsAvailable"},
+        {2002, nullptr, "NotifyAlbumStorageIsUnavailable"},
+        {2011, nullptr, "RegisterAppletResourceUserId"},
+        {2012, nullptr, "UnregisterAppletResourceUserId"},
+        {2013, nullptr, "GetApplicationIdFromAruid"},
+        {2014, nullptr, "CheckApplicationIdRegistered"},
+        {2101, nullptr, "GenerateCurrentAlbumFileId"},
+        {2102, nullptr, "GenerateApplicationAlbumEntry"},
+        {2201, nullptr, "SaveAlbumScreenShotFile"},
+        {2202, nullptr, "SaveAlbumScreenShotFileEx"},
+        {2301, nullptr, "SetOverlayScreenShotThumbnailData"},
+        {2302, nullptr, "SetOverlayMovieThumbnailData"},
+        {60001, nullptr, "OpenControlSession"},
+    };
+    // clang-format on
+
+    RegisterHandlers(functions);
 }
 
 IAlbumControlService::~IAlbumControlService() = default;