Merge pull request #9232 from bunnei/audio-default-thread
hle: service: audio: Use default service thread.
This commit is contained in:
		@@ -203,9 +203,8 @@ private:
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
AudInU::AudInU(Core::System& system_)
 | 
			
		||||
    : ServiceFramework{system_, "audin:u", ServiceThreadType::CreateNew},
 | 
			
		||||
      service_context{system_, "AudInU"}, impl{std::make_unique<AudioCore::AudioIn::Manager>(
 | 
			
		||||
                                              system_)} {
 | 
			
		||||
    : ServiceFramework{system_, "audin:u"}, service_context{system_, "AudInU"},
 | 
			
		||||
      impl{std::make_unique<AudioCore::AudioIn::Manager>(system_)} {
 | 
			
		||||
    // clang-format off
 | 
			
		||||
    static const FunctionInfo functions[] = {
 | 
			
		||||
        {0, &AudInU::ListAudioIns, "ListAudioIns"},
 | 
			
		||||
 
 | 
			
		||||
@@ -26,9 +26,8 @@ public:
 | 
			
		||||
    explicit IAudioOut(Core::System& system_, AudioCore::AudioOut::Manager& manager,
 | 
			
		||||
                       size_t session_id, const std::string& device_name,
 | 
			
		||||
                       const AudioOutParameter& in_params, u32 handle, u64 applet_resource_user_id)
 | 
			
		||||
        : ServiceFramework{system_, "IAudioOut", ServiceThreadType::CreateNew},
 | 
			
		||||
          service_context{system_, "IAudioOut"}, event{service_context.CreateEvent(
 | 
			
		||||
                                                     "AudioOutEvent")},
 | 
			
		||||
        : ServiceFramework{system_, "IAudioOut"}, service_context{system_, "IAudioOut"},
 | 
			
		||||
          event{service_context.CreateEvent("AudioOutEvent")},
 | 
			
		||||
          impl{std::make_shared<AudioCore::AudioOut::Out>(system_, manager, event, session_id)} {
 | 
			
		||||
 | 
			
		||||
        // clang-format off
 | 
			
		||||
@@ -221,9 +220,8 @@ private:
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
AudOutU::AudOutU(Core::System& system_)
 | 
			
		||||
    : ServiceFramework{system_, "audout:u", ServiceThreadType::CreateNew},
 | 
			
		||||
      service_context{system_, "AudOutU"}, impl{std::make_unique<AudioCore::AudioOut::Manager>(
 | 
			
		||||
                                               system_)} {
 | 
			
		||||
    : ServiceFramework{system_, "audout:u"}, service_context{system_, "AudOutU"},
 | 
			
		||||
      impl{std::make_unique<AudioCore::AudioOut::Manager>(system_)} {
 | 
			
		||||
    // clang-format off
 | 
			
		||||
    static const FunctionInfo functions[] = {
 | 
			
		||||
        {0, &AudOutU::ListAudioOuts, "ListAudioOuts"},
 | 
			
		||||
 
 | 
			
		||||
@@ -35,10 +35,9 @@ public:
 | 
			
		||||
                            AudioCore::AudioRendererParameterInternal& params,
 | 
			
		||||
                            Kernel::KTransferMemory* transfer_memory, u64 transfer_memory_size,
 | 
			
		||||
                            u32 process_handle, u64 applet_resource_user_id, s32 session_id)
 | 
			
		||||
        : ServiceFramework{system_, "IAudioRenderer", ServiceThreadType::CreateNew},
 | 
			
		||||
          service_context{system_, "IAudioRenderer"}, rendered_event{service_context.CreateEvent(
 | 
			
		||||
                                                          "IAudioRendererEvent")},
 | 
			
		||||
          manager{manager_}, impl{std::make_unique<Renderer>(system_, manager, rendered_event)} {
 | 
			
		||||
        : ServiceFramework{system_, "IAudioRenderer"}, service_context{system_, "IAudioRenderer"},
 | 
			
		||||
          rendered_event{service_context.CreateEvent("IAudioRendererEvent")}, manager{manager_},
 | 
			
		||||
          impl{std::make_unique<Renderer>(system_, manager, rendered_event)} {
 | 
			
		||||
        // clang-format off
 | 
			
		||||
        static const FunctionInfo functions[] = {
 | 
			
		||||
            {0, &IAudioRenderer::GetSampleRate, "GetSampleRate"},
 | 
			
		||||
@@ -243,10 +242,8 @@ class IAudioDevice final : public ServiceFramework<IAudioDevice> {
 | 
			
		||||
public:
 | 
			
		||||
    explicit IAudioDevice(Core::System& system_, u64 applet_resource_user_id, u32 revision,
 | 
			
		||||
                          u32 device_num)
 | 
			
		||||
        : ServiceFramework{system_, "IAudioDevice", ServiceThreadType::CreateNew},
 | 
			
		||||
          service_context{system_, "IAudioDevice"}, impl{std::make_unique<AudioDevice>(
 | 
			
		||||
                                                        system_, applet_resource_user_id,
 | 
			
		||||
                                                        revision)},
 | 
			
		||||
        : ServiceFramework{system_, "IAudioDevice"}, service_context{system_, "IAudioDevice"},
 | 
			
		||||
          impl{std::make_unique<AudioDevice>(system_, applet_resource_user_id, revision)},
 | 
			
		||||
          event{service_context.CreateEvent(fmt::format("IAudioDeviceEvent-{}", device_num))} {
 | 
			
		||||
        static const FunctionInfo functions[] = {
 | 
			
		||||
            {0, &IAudioDevice::ListAudioDeviceName, "ListAudioDeviceName"},
 | 
			
		||||
@@ -421,7 +418,7 @@ private:
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
AudRenU::AudRenU(Core::System& system_)
 | 
			
		||||
    : ServiceFramework{system_, "audren:u", ServiceThreadType::CreateNew},
 | 
			
		||||
    : ServiceFramework{system_, "audren:u"},
 | 
			
		||||
      service_context{system_, "audren:u"}, impl{std::make_unique<Manager>(system_)} {
 | 
			
		||||
    // clang-format off
 | 
			
		||||
    static const FunctionInfo functions[] = {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user