summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-07-20 18:17:07 +0200
committerGitHub <noreply@github.com>2018-07-20 18:17:07 +0200
commit701c7cb85ce48f627f422f593843fa692f785236 (patch)
tree65030bd5eaa71479c8db3f23c87496a020e16d75 /src
parentMerge pull request #735 from lioncash/video-unused (diff)
parentaudren_u: Use a std::array instead of std::string for holding the audio interface/device name (diff)
downloadyuzu-701c7cb85ce48f627f422f593843fa692f785236.tar
yuzu-701c7cb85ce48f627f422f593843fa692f785236.tar.gz
yuzu-701c7cb85ce48f627f422f593843fa692f785236.tar.bz2
yuzu-701c7cb85ce48f627f422f593843fa692f785236.tar.lz
yuzu-701c7cb85ce48f627f422f593843fa692f785236.tar.xz
yuzu-701c7cb85ce48f627f422f593843fa692f785236.tar.zst
yuzu-701c7cb85ce48f627f422f593843fa692f785236.zip
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/service/audio/audout_u.cpp3
-rw-r--r--src/core/hle/service/audio/audren_u.cpp6
2 files changed, 6 insertions, 3 deletions
diff --git a/src/core/hle/service/audio/audout_u.cpp b/src/core/hle/service/audio/audout_u.cpp
index 4217ea4fb..154bc12da 100644
--- a/src/core/hle/service/audio/audout_u.cpp
+++ b/src/core/hle/service/audio/audout_u.cpp
@@ -2,6 +2,7 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
+#include <array>
#include <vector>
#include "common/logging/log.h"
#include "core/core_timing.h"
@@ -167,7 +168,7 @@ void AudOutU::ListAudioOutsImpl(Kernel::HLERequestContext& ctx) {
LOG_WARNING(Service_Audio, "(STUBBED) called");
IPC::RequestParser rp{ctx};
- const std::string audio_interface = "AudioInterface";
+ constexpr std::array<char, 15> audio_interface{{"AudioInterface"}};
ctx.WriteBuffer(audio_interface);
IPC::ResponseBuilder rb = rp.MakeBuilder(3, 0, 0);
diff --git a/src/core/hle/service/audio/audren_u.cpp b/src/core/hle/service/audio/audren_u.cpp
index 6903f52d6..e623f4f8e 100644
--- a/src/core/hle/service/audio/audren_u.cpp
+++ b/src/core/hle/service/audio/audren_u.cpp
@@ -2,6 +2,8 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
+#include <array>
+
#include "common/alignment.h"
#include "common/logging/log.h"
#include "core/core_timing.h"
@@ -298,7 +300,7 @@ private:
LOG_WARNING(Service_Audio, "(STUBBED) called");
IPC::RequestParser rp{ctx};
- const std::string audio_interface = "AudioInterface";
+ constexpr std::array<char, 15> audio_interface{{"AudioInterface"}};
ctx.WriteBuffer(audio_interface);
IPC::ResponseBuilder rb = rp.MakeBuilder(3, 0, 0);
@@ -323,7 +325,7 @@ private:
LOG_WARNING(Service_Audio, "(STUBBED) called");
IPC::RequestParser rp{ctx};
- const std::string audio_interface = "AudioDevice";
+ constexpr std::array<char, 12> audio_interface{{"AudioDevice"}};
ctx.WriteBuffer(audio_interface);
IPC::ResponseBuilder rb = rp.MakeBuilder(3, 0, 0);