summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorGravatar bunnei2018-03-25 03:21:27 -0400
committerGravatar bunnei2018-03-25 03:24:20 -0400
commit6f27edccb2e0319d052b104250eb0fdd0046d705 (patch)
treef6bcc6bb5bc333d48ac1bb70e1a1a4debfd10dce /src/core
parenthid: Stub out SetNpadJoyAssignmentModeDual. (diff)
downloadyuzu-6f27edccb2e0319d052b104250eb0fdd0046d705.tar.gz
yuzu-6f27edccb2e0319d052b104250eb0fdd0046d705.tar.xz
yuzu-6f27edccb2e0319d052b104250eb0fdd0046d705.zip
audren_u: Fix GetAudioDevice.
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hle/service/audio/audren_u.cpp53
-rw-r--r--src/core/hle/service/audio/audren_u.h2
2 files changed, 48 insertions, 7 deletions
diff --git a/src/core/hle/service/audio/audren_u.cpp b/src/core/hle/service/audio/audren_u.cpp
index 1cbca6c4b..f52cd7d90 100644
--- a/src/core/hle/service/audio/audren_u.cpp
+++ b/src/core/hle/service/audio/audren_u.cpp
@@ -151,12 +151,52 @@ private:
151 Kernel::SharedPtr<Kernel::Event> system_event; 151 Kernel::SharedPtr<Kernel::Event> system_event;
152}; 152};
153 153
154class IAudioDevice final : public ServiceFramework<IAudioDevice> {
155public:
156 IAudioDevice() : ServiceFramework("IAudioDevice") {
157 static const FunctionInfo functions[] = {
158 {0x0, &IAudioDevice::ListAudioDeviceName, "ListAudioDeviceName"},
159 {0x1, &IAudioDevice::SetAudioDeviceOutputVolume, "SetAudioDeviceOutputVolume"}};
160 RegisterHandlers(functions);
161
162 buffer_event =
163 Kernel::Event::Create(Kernel::ResetType::OneShot, "IAudioOutBufferReleasedEvent");
164 }
165
166private:
167 void ListAudioDeviceName(Kernel::HLERequestContext& ctx) {
168 LOG_WARNING(Service_Audio, "(STUBBED) called");
169 IPC::RequestParser rp{ctx};
170
171 const std::string audio_interface = "AudioInterface";
172 ctx.WriteBuffer(audio_interface.c_str(), audio_interface.size());
173
174 IPC::ResponseBuilder rb = rp.MakeBuilder(3, 0, 0);
175 rb.Push(RESULT_SUCCESS);
176 rb.Push<u32>(1);
177 }
178
179 void SetAudioDeviceOutputVolume(Kernel::HLERequestContext& ctx) {
180 LOG_WARNING(Service_Audio, "(STUBBED) called");
181
182 IPC::RequestParser rp{ctx};
183 f32 volume = static_cast<f32>(rp.Pop<u32>());
184
185 auto file_buffer = ctx.ReadBuffer();
186 auto end = std::find(file_buffer.begin(), file_buffer.end(), '\0');
187
188 IPC::ResponseBuilder rb = rp.MakeBuilder(2, 0, 0);
189 rb.Push(RESULT_SUCCESS);
190 }
191
192 Kernel::SharedPtr<Kernel::Event> buffer_event;
193};
194
154AudRenU::AudRenU() : ServiceFramework("audren:u") { 195AudRenU::AudRenU() : ServiceFramework("audren:u") {
155 static const FunctionInfo functions[] = { 196 static const FunctionInfo functions[] = {
156 {0, &AudRenU::OpenAudioRenderer, "OpenAudioRenderer"}, 197 {0, &AudRenU::OpenAudioRenderer, "OpenAudioRenderer"},
157 {1, &AudRenU::GetAudioRendererWorkBufferSize, "GetAudioRendererWorkBufferSize"}, 198 {1, &AudRenU::GetAudioRendererWorkBufferSize, "GetAudioRendererWorkBufferSize"},
158 {2, &AudRenU::GetAudioRenderersProcessMasterVolume, "GetAudioRenderersProcessMasterVolume"}, 199 {2, &AudRenU::GetAudioDevice, "GetAudioDevice"},
159 {3, nullptr, "SetAudioRenderersProcessMasterVolume"},
160 }; 200 };
161 RegisterHandlers(functions); 201 RegisterHandlers(functions);
162} 202}
@@ -179,12 +219,13 @@ void AudRenU::GetAudioRendererWorkBufferSize(Kernel::HLERequestContext& ctx) {
179 LOG_WARNING(Service_Audio, "(STUBBED) called"); 219 LOG_WARNING(Service_Audio, "(STUBBED) called");
180} 220}
181 221
182void AudRenU::GetAudioRenderersProcessMasterVolume(Kernel::HLERequestContext& ctx) { 222void AudRenU::GetAudioDevice(Kernel::HLERequestContext& ctx) {
183 IPC::ResponseBuilder rb{ctx, 3}; 223 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
184 224
185 rb.Push(RESULT_SUCCESS); 225 rb.Push(RESULT_SUCCESS);
186 rb.Push<u32>(100); 226 rb.PushIpcInterface<Audio::IAudioDevice>();
187 LOG_WARNING(Service_Audio, "(STUBBED) called"); 227
228 LOG_DEBUG(Service_Audio, "called");
188} 229}
189 230
190} // namespace Audio 231} // namespace Audio
diff --git a/src/core/hle/service/audio/audren_u.h b/src/core/hle/service/audio/audren_u.h
index 939d353a9..f59d1627d 100644
--- a/src/core/hle/service/audio/audren_u.h
+++ b/src/core/hle/service/audio/audren_u.h
@@ -21,7 +21,7 @@ public:
21private: 21private:
22 void OpenAudioRenderer(Kernel::HLERequestContext& ctx); 22 void OpenAudioRenderer(Kernel::HLERequestContext& ctx);
23 void GetAudioRendererWorkBufferSize(Kernel::HLERequestContext& ctx); 23 void GetAudioRendererWorkBufferSize(Kernel::HLERequestContext& ctx);
24 void GetAudioRenderersProcessMasterVolume(Kernel::HLERequestContext& ctx); 24 void GetAudioDevice(Kernel::HLERequestContext& ctx);
25}; 25};
26 26
27} // namespace Audio 27} // namespace Audio