diff options
author | bunnei <bunneidev@gmail.com> | 2021-04-27 01:19:49 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-27 01:19:49 +0200 |
commit | cd80471c902540ae1086732234d45b6fb5b2e169 (patch) | |
tree | 7a58e71917ee449e441e726b662b78757a3310d8 /src/core/hle/service/bcat/module.cpp | |
parent | Merge pull request #6236 from Morph1984/swkbd-button-hint-scaling (diff) | |
parent | service: Eliminate cases of member shadowing (diff) | |
download | yuzu-cd80471c902540ae1086732234d45b6fb5b2e169.tar yuzu-cd80471c902540ae1086732234d45b6fb5b2e169.tar.gz yuzu-cd80471c902540ae1086732234d45b6fb5b2e169.tar.bz2 yuzu-cd80471c902540ae1086732234d45b6fb5b2e169.tar.lz yuzu-cd80471c902540ae1086732234d45b6fb5b2e169.tar.xz yuzu-cd80471c902540ae1086732234d45b6fb5b2e169.tar.zst yuzu-cd80471c902540ae1086732234d45b6fb5b2e169.zip |
Diffstat (limited to 'src/core/hle/service/bcat/module.cpp')
-rw-r--r-- | src/core/hle/service/bcat/module.cpp | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/src/core/hle/service/bcat/module.cpp b/src/core/hle/service/bcat/module.cpp index c7dd04a6e..285085f2a 100644 --- a/src/core/hle/service/bcat/module.cpp +++ b/src/core/hle/service/bcat/module.cpp @@ -174,9 +174,9 @@ private: }; std::shared_ptr<IDeliveryCacheProgressService> CreateProgressService(SyncType type) { - auto& backend{progress.at(static_cast<std::size_t>(type))}; - return std::make_shared<IDeliveryCacheProgressService>(system, backend.GetEvent(), - backend.GetImpl()); + auto& progress_backend{GetProgressBackend(type)}; + return std::make_shared<IDeliveryCacheProgressService>(system, progress_backend.GetEvent(), + progress_backend.GetImpl()); } void RequestSyncDeliveryCache(Kernel::HLERequestContext& ctx) { @@ -184,7 +184,7 @@ private: backend.Synchronize({system.CurrentProcess()->GetTitleID(), GetCurrentBuildID(system.GetCurrentProcessBuildID())}, - progress.at(static_cast<std::size_t>(SyncType::Normal))); + GetProgressBackend(SyncType::Normal)); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; rb.Push(RESULT_SUCCESS); @@ -201,8 +201,7 @@ private: backend.SynchronizeDirectory({system.CurrentProcess()->GetTitleID(), GetCurrentBuildID(system.GetCurrentProcessBuildID())}, - name, - progress.at(static_cast<std::size_t>(SyncType::Directory))); + name, GetProgressBackend(SyncType::Directory)); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; rb.Push(RESULT_SUCCESS); @@ -265,9 +264,16 @@ private: rb.Push(RESULT_SUCCESS); } - Backend& backend; + ProgressServiceBackend& GetProgressBackend(SyncType type) { + return progress.at(static_cast<size_t>(type)); + } - std::array<ProgressServiceBackend, static_cast<std::size_t>(SyncType::Count)> progress; + const ProgressServiceBackend& GetProgressBackend(SyncType type) const { + return progress.at(static_cast<size_t>(type)); + } + + Backend& backend; + std::array<ProgressServiceBackend, static_cast<size_t>(SyncType::Count)> progress; }; void Module::Interface::CreateBcatService(Kernel::HLERequestContext& ctx) { |