summaryrefslogtreecommitdiffstats
path: root/src/audio_core/memory_pool.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2020-12-03 08:08:43 +0100
committerGitHub <noreply@github.com>2020-12-03 08:08:43 +0100
commit88089c87546b62536a27738f5ee03dff52fa76e9 (patch)
tree5221c80d0ac3e7bbdb0c342098378e6c84951658 /src/audio_core/memory_pool.cpp
parentMerge pull request #5002 from ameerj/nvdec-frameskip (diff)
parentaudio_core: Make shadowing and unused parameters errors (diff)
downloadyuzu-88089c87546b62536a27738f5ee03dff52fa76e9.tar
yuzu-88089c87546b62536a27738f5ee03dff52fa76e9.tar.gz
yuzu-88089c87546b62536a27738f5ee03dff52fa76e9.tar.bz2
yuzu-88089c87546b62536a27738f5ee03dff52fa76e9.tar.lz
yuzu-88089c87546b62536a27738f5ee03dff52fa76e9.tar.xz
yuzu-88089c87546b62536a27738f5ee03dff52fa76e9.tar.zst
yuzu-88089c87546b62536a27738f5ee03dff52fa76e9.zip
Diffstat (limited to 'src/audio_core/memory_pool.cpp')
-rw-r--r--src/audio_core/memory_pool.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/audio_core/memory_pool.cpp b/src/audio_core/memory_pool.cpp
index 5a3453063..6b6908d26 100644
--- a/src/audio_core/memory_pool.cpp
+++ b/src/audio_core/memory_pool.cpp
@@ -10,11 +10,10 @@ namespace AudioCore {
ServerMemoryPoolInfo::ServerMemoryPoolInfo() = default;
ServerMemoryPoolInfo::~ServerMemoryPoolInfo() = default;
-bool ServerMemoryPoolInfo::Update(const ServerMemoryPoolInfo::InParams& in_params,
- ServerMemoryPoolInfo::OutParams& out_params) {
+
+bool ServerMemoryPoolInfo::Update(const InParams& in_params, OutParams& out_params) {
// Our state does not need to be changed
- if (in_params.state != ServerMemoryPoolInfo::State::RequestAttach &&
- in_params.state != ServerMemoryPoolInfo::State::RequestDetach) {
+ if (in_params.state != State::RequestAttach && in_params.state != State::RequestDetach) {
return true;
}
@@ -32,11 +31,11 @@ bool ServerMemoryPoolInfo::Update(const ServerMemoryPoolInfo::InParams& in_param
return false;
}
- if (in_params.state == ServerMemoryPoolInfo::State::RequestAttach) {
+ if (in_params.state == State::RequestAttach) {
cpu_address = in_params.address;
size = in_params.size;
used = true;
- out_params.state = ServerMemoryPoolInfo::State::Attached;
+ out_params.state = State::Attached;
} else {
// Unexpected address
if (cpu_address != in_params.address) {
@@ -54,7 +53,7 @@ bool ServerMemoryPoolInfo::Update(const ServerMemoryPoolInfo::InParams& in_param
cpu_address = 0;
size = 0;
used = false;
- out_params.state = ServerMemoryPoolInfo::State::Detached;
+ out_params.state = State::Detached;
}
return true;
}