summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar bunnei2022-12-14 14:57:33 -0800
committerGravatar GitHub2022-12-14 14:57:33 -0800
commitbeba9c9b61318164557df3933bf3f5eb660b5eec (patch)
tree0e07c1af31737e2fddc50d032522cfc4b95a1c29
parentMerge pull request #6688 from yzct12345/valid-intel-max (diff)
downloadyuzu-beba9c9b61318164557df3933bf3f5eb660b5eec.tar.gz
yuzu-beba9c9b61318164557df3933bf3f5eb660b5eec.tar.xz
yuzu-beba9c9b61318164557df3933bf3f5eb660b5eec.zip
Revert "hle: service: audio: Use default service thread."
-rw-r--r--src/core/hle/service/audio/audin_u.cpp5
-rw-r--r--src/core/hle/service/audio/audout_u.cpp10
-rw-r--r--src/core/hle/service/audio/audren_u.cpp15
3 files changed, 18 insertions, 12 deletions
diff --git a/src/core/hle/service/audio/audin_u.cpp b/src/core/hle/service/audio/audin_u.cpp
index 26dec7147..053e8f9dd 100644
--- a/src/core/hle/service/audio/audin_u.cpp
+++ b/src/core/hle/service/audio/audin_u.cpp
@@ -203,8 +203,9 @@ private:
203}; 203};
204 204
205AudInU::AudInU(Core::System& system_) 205AudInU::AudInU(Core::System& system_)
206 : ServiceFramework{system_, "audin:u"}, service_context{system_, "AudInU"}, 206 : ServiceFramework{system_, "audin:u", ServiceThreadType::CreateNew},
207 impl{std::make_unique<AudioCore::AudioIn::Manager>(system_)} { 207 service_context{system_, "AudInU"}, impl{std::make_unique<AudioCore::AudioIn::Manager>(
208 system_)} {
208 // clang-format off 209 // clang-format off
209 static const FunctionInfo functions[] = { 210 static const FunctionInfo functions[] = {
210 {0, &AudInU::ListAudioIns, "ListAudioIns"}, 211 {0, &AudInU::ListAudioIns, "ListAudioIns"},
diff --git a/src/core/hle/service/audio/audout_u.cpp b/src/core/hle/service/audio/audout_u.cpp
index 991e30ba1..29751f075 100644
--- a/src/core/hle/service/audio/audout_u.cpp
+++ b/src/core/hle/service/audio/audout_u.cpp
@@ -26,8 +26,9 @@ public:
26 explicit IAudioOut(Core::System& system_, AudioCore::AudioOut::Manager& manager, 26 explicit IAudioOut(Core::System& system_, AudioCore::AudioOut::Manager& manager,
27 size_t session_id, const std::string& device_name, 27 size_t session_id, const std::string& device_name,
28 const AudioOutParameter& in_params, u32 handle, u64 applet_resource_user_id) 28 const AudioOutParameter& in_params, u32 handle, u64 applet_resource_user_id)
29 : ServiceFramework{system_, "IAudioOut"}, service_context{system_, "IAudioOut"}, 29 : ServiceFramework{system_, "IAudioOut", ServiceThreadType::CreateNew},
30 event{service_context.CreateEvent("AudioOutEvent")}, 30 service_context{system_, "IAudioOut"}, event{service_context.CreateEvent(
31 "AudioOutEvent")},
31 impl{std::make_shared<AudioCore::AudioOut::Out>(system_, manager, event, session_id)} { 32 impl{std::make_shared<AudioCore::AudioOut::Out>(system_, manager, event, session_id)} {
32 33
33 // clang-format off 34 // clang-format off
@@ -220,8 +221,9 @@ private:
220}; 221};
221 222
222AudOutU::AudOutU(Core::System& system_) 223AudOutU::AudOutU(Core::System& system_)
223 : ServiceFramework{system_, "audout:u"}, service_context{system_, "AudOutU"}, 224 : ServiceFramework{system_, "audout:u", ServiceThreadType::CreateNew},
224 impl{std::make_unique<AudioCore::AudioOut::Manager>(system_)} { 225 service_context{system_, "AudOutU"}, impl{std::make_unique<AudioCore::AudioOut::Manager>(
226 system_)} {
225 // clang-format off 227 // clang-format off
226 static const FunctionInfo functions[] = { 228 static const FunctionInfo functions[] = {
227 {0, &AudOutU::ListAudioOuts, "ListAudioOuts"}, 229 {0, &AudOutU::ListAudioOuts, "ListAudioOuts"},
diff --git a/src/core/hle/service/audio/audren_u.cpp b/src/core/hle/service/audio/audren_u.cpp
index ead16c321..3a1c231b6 100644
--- a/src/core/hle/service/audio/audren_u.cpp
+++ b/src/core/hle/service/audio/audren_u.cpp
@@ -35,9 +35,10 @@ public:
35 AudioCore::AudioRendererParameterInternal& params, 35 AudioCore::AudioRendererParameterInternal& params,
36 Kernel::KTransferMemory* transfer_memory, u64 transfer_memory_size, 36 Kernel::KTransferMemory* transfer_memory, u64 transfer_memory_size,
37 u32 process_handle, u64 applet_resource_user_id, s32 session_id) 37 u32 process_handle, u64 applet_resource_user_id, s32 session_id)
38 : ServiceFramework{system_, "IAudioRenderer"}, service_context{system_, "IAudioRenderer"}, 38 : ServiceFramework{system_, "IAudioRenderer", ServiceThreadType::CreateNew},
39 rendered_event{service_context.CreateEvent("IAudioRendererEvent")}, manager{manager_}, 39 service_context{system_, "IAudioRenderer"}, rendered_event{service_context.CreateEvent(
40 impl{std::make_unique<Renderer>(system_, manager, rendered_event)} { 40 "IAudioRendererEvent")},
41 manager{manager_}, impl{std::make_unique<Renderer>(system_, manager, rendered_event)} {
41 // clang-format off 42 // clang-format off
42 static const FunctionInfo functions[] = { 43 static const FunctionInfo functions[] = {
43 {0, &IAudioRenderer::GetSampleRate, "GetSampleRate"}, 44 {0, &IAudioRenderer::GetSampleRate, "GetSampleRate"},
@@ -242,8 +243,10 @@ class IAudioDevice final : public ServiceFramework<IAudioDevice> {
242public: 243public:
243 explicit IAudioDevice(Core::System& system_, u64 applet_resource_user_id, u32 revision, 244 explicit IAudioDevice(Core::System& system_, u64 applet_resource_user_id, u32 revision,
244 u32 device_num) 245 u32 device_num)
245 : ServiceFramework{system_, "IAudioDevice"}, service_context{system_, "IAudioDevice"}, 246 : ServiceFramework{system_, "IAudioDevice", ServiceThreadType::CreateNew},
246 impl{std::make_unique<AudioDevice>(system_, applet_resource_user_id, revision)}, 247 service_context{system_, "IAudioDevice"}, impl{std::make_unique<AudioDevice>(
248 system_, applet_resource_user_id,
249 revision)},
247 event{service_context.CreateEvent(fmt::format("IAudioDeviceEvent-{}", device_num))} { 250 event{service_context.CreateEvent(fmt::format("IAudioDeviceEvent-{}", device_num))} {
248 static const FunctionInfo functions[] = { 251 static const FunctionInfo functions[] = {
249 {0, &IAudioDevice::ListAudioDeviceName, "ListAudioDeviceName"}, 252 {0, &IAudioDevice::ListAudioDeviceName, "ListAudioDeviceName"},
@@ -418,7 +421,7 @@ private:
418}; 421};
419 422
420AudRenU::AudRenU(Core::System& system_) 423AudRenU::AudRenU(Core::System& system_)
421 : ServiceFramework{system_, "audren:u"}, 424 : ServiceFramework{system_, "audren:u", ServiceThreadType::CreateNew},
422 service_context{system_, "audren:u"}, impl{std::make_unique<Manager>(system_)} { 425 service_context{system_, "audren:u"}, impl{std::make_unique<Manager>(system_)} {
423 // clang-format off 426 // clang-format off
424 static const FunctionInfo functions[] = { 427 static const FunctionInfo functions[] = {