diff options
| author | 2018-04-24 10:18:09 -0400 | |
|---|---|---|
| committer | 2018-04-24 10:18:09 -0400 | |
| commit | 8d32bf9a96bf8eea855d3ad1614e3f7f4f27ff8d (patch) | |
| tree | 82134c0f5555067a88d7ff76d1164329f32052d1 /src | |
| parent | apm: Move logging macros over to new fmt-compatible ones (diff) | |
| download | yuzu-8d32bf9a96bf8eea855d3ad1614e3f7f4f27ff8d.tar.gz yuzu-8d32bf9a96bf8eea855d3ad1614e3f7f4f27ff8d.tar.xz yuzu-8d32bf9a96bf8eea855d3ad1614e3f7f4f27ff8d.zip | |
audio: Move logging macros over to new fmt-compatible ones
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/service/audio/audout_u.cpp | 16 | ||||
| -rw-r--r-- | src/core/hle/service/audio/audren_u.cpp | 26 |
2 files changed, 21 insertions, 21 deletions
diff --git a/src/core/hle/service/audio/audout_u.cpp b/src/core/hle/service/audio/audout_u.cpp index 2d7f8cb04..6297dc450 100644 --- a/src/core/hle/service/audio/audout_u.cpp +++ b/src/core/hle/service/audio/audout_u.cpp | |||
| @@ -60,14 +60,14 @@ public: | |||
| 60 | 60 | ||
| 61 | private: | 61 | private: |
| 62 | void GetAudioOutState(Kernel::HLERequestContext& ctx) { | 62 | void GetAudioOutState(Kernel::HLERequestContext& ctx) { |
| 63 | LOG_DEBUG(Service_Audio, "called"); | 63 | NGLOG_DEBUG(Service_Audio, "called"); |
| 64 | IPC::ResponseBuilder rb{ctx, 3}; | 64 | IPC::ResponseBuilder rb{ctx, 3}; |
| 65 | rb.Push(RESULT_SUCCESS); | 65 | rb.Push(RESULT_SUCCESS); |
| 66 | rb.Push(static_cast<u32>(audio_out_state)); | 66 | rb.Push(static_cast<u32>(audio_out_state)); |
| 67 | } | 67 | } |
| 68 | 68 | ||
| 69 | void StartAudioOut(Kernel::HLERequestContext& ctx) { | 69 | void StartAudioOut(Kernel::HLERequestContext& ctx) { |
| 70 | LOG_WARNING(Service_Audio, "(STUBBED) called"); | 70 | NGLOG_WARNING(Service_Audio, "(STUBBED) called"); |
| 71 | 71 | ||
| 72 | // Start audio | 72 | // Start audio |
| 73 | audio_out_state = AudioState::Started; | 73 | audio_out_state = AudioState::Started; |
| @@ -77,7 +77,7 @@ private: | |||
| 77 | } | 77 | } |
| 78 | 78 | ||
| 79 | void StopAudioOut(Kernel::HLERequestContext& ctx) { | 79 | void StopAudioOut(Kernel::HLERequestContext& ctx) { |
| 80 | LOG_WARNING(Service_Audio, "(STUBBED) called"); | 80 | NGLOG_WARNING(Service_Audio, "(STUBBED) called"); |
| 81 | 81 | ||
| 82 | // Stop audio | 82 | // Stop audio |
| 83 | audio_out_state = AudioState::Stopped; | 83 | audio_out_state = AudioState::Stopped; |
| @@ -89,7 +89,7 @@ private: | |||
| 89 | } | 89 | } |
| 90 | 90 | ||
| 91 | void RegisterBufferEvent(Kernel::HLERequestContext& ctx) { | 91 | void RegisterBufferEvent(Kernel::HLERequestContext& ctx) { |
| 92 | LOG_WARNING(Service_Audio, "(STUBBED) called"); | 92 | NGLOG_WARNING(Service_Audio, "(STUBBED) called"); |
| 93 | 93 | ||
| 94 | IPC::ResponseBuilder rb{ctx, 2, 1}; | 94 | IPC::ResponseBuilder rb{ctx, 2, 1}; |
| 95 | rb.Push(RESULT_SUCCESS); | 95 | rb.Push(RESULT_SUCCESS); |
| @@ -97,7 +97,7 @@ private: | |||
| 97 | } | 97 | } |
| 98 | 98 | ||
| 99 | void AppendAudioOutBuffer(Kernel::HLERequestContext& ctx) { | 99 | void AppendAudioOutBuffer(Kernel::HLERequestContext& ctx) { |
| 100 | LOG_WARNING(Service_Audio, "(STUBBED) called"); | 100 | NGLOG_WARNING(Service_Audio, "(STUBBED) called"); |
| 101 | IPC::RequestParser rp{ctx}; | 101 | IPC::RequestParser rp{ctx}; |
| 102 | 102 | ||
| 103 | const u64 key{rp.Pop<u64>()}; | 103 | const u64 key{rp.Pop<u64>()}; |
| @@ -108,7 +108,7 @@ private: | |||
| 108 | } | 108 | } |
| 109 | 109 | ||
| 110 | void GetReleasedAudioOutBuffer(Kernel::HLERequestContext& ctx) { | 110 | void GetReleasedAudioOutBuffer(Kernel::HLERequestContext& ctx) { |
| 111 | LOG_WARNING(Service_Audio, "(STUBBED) called"); | 111 | NGLOG_WARNING(Service_Audio, "(STUBBED) called"); |
| 112 | 112 | ||
| 113 | // TODO(st4rk): This is how libtransistor currently implements the | 113 | // TODO(st4rk): This is how libtransistor currently implements the |
| 114 | // GetReleasedAudioOutBuffer, it should return the key (a VAddr) to the app and this address | 114 | // GetReleasedAudioOutBuffer, it should return the key (a VAddr) to the app and this address |
| @@ -164,7 +164,7 @@ private: | |||
| 164 | }; | 164 | }; |
| 165 | 165 | ||
| 166 | void AudOutU::ListAudioOuts(Kernel::HLERequestContext& ctx) { | 166 | void AudOutU::ListAudioOuts(Kernel::HLERequestContext& ctx) { |
| 167 | LOG_WARNING(Service_Audio, "(STUBBED) called"); | 167 | NGLOG_WARNING(Service_Audio, "(STUBBED) called"); |
| 168 | IPC::RequestParser rp{ctx}; | 168 | IPC::RequestParser rp{ctx}; |
| 169 | 169 | ||
| 170 | const std::string audio_interface = "AudioInterface"; | 170 | const std::string audio_interface = "AudioInterface"; |
| @@ -180,7 +180,7 @@ void AudOutU::ListAudioOuts(Kernel::HLERequestContext& ctx) { | |||
| 180 | } | 180 | } |
| 181 | 181 | ||
| 182 | void AudOutU::OpenAudioOut(Kernel::HLERequestContext& ctx) { | 182 | void AudOutU::OpenAudioOut(Kernel::HLERequestContext& ctx) { |
| 183 | LOG_WARNING(Service_Audio, "(STUBBED) called"); | 183 | NGLOG_WARNING(Service_Audio, "(STUBBED) called"); |
| 184 | 184 | ||
| 185 | if (!audio_out_interface) { | 185 | if (!audio_out_interface) { |
| 186 | audio_out_interface = std::make_shared<IAudioOut>(); | 186 | audio_out_interface = std::make_shared<IAudioOut>(); |
diff --git a/src/core/hle/service/audio/audren_u.cpp b/src/core/hle/service/audio/audren_u.cpp index d9245cb19..72810b436 100644 --- a/src/core/hle/service/audio/audren_u.cpp +++ b/src/core/hle/service/audio/audren_u.cpp | |||
| @@ -56,7 +56,7 @@ private: | |||
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | void RequestUpdateAudioRenderer(Kernel::HLERequestContext& ctx) { | 58 | void RequestUpdateAudioRenderer(Kernel::HLERequestContext& ctx) { |
| 59 | LOG_DEBUG(Service_Audio, "%s", ctx.Description().c_str()); | 59 | NGLOG_DEBUG(Service_Audio, "{}", ctx.Description()); |
| 60 | AudioRendererResponseData response_data{}; | 60 | AudioRendererResponseData response_data{}; |
| 61 | 61 | ||
| 62 | response_data.section_0_size = | 62 | response_data.section_0_size = |
| @@ -79,7 +79,7 @@ private: | |||
| 79 | 79 | ||
| 80 | rb.Push(RESULT_SUCCESS); | 80 | rb.Push(RESULT_SUCCESS); |
| 81 | 81 | ||
| 82 | LOG_WARNING(Service_Audio, "(STUBBED) called"); | 82 | NGLOG_WARNING(Service_Audio, "(STUBBED) called"); |
| 83 | } | 83 | } |
| 84 | 84 | ||
| 85 | void StartAudioRenderer(Kernel::HLERequestContext& ctx) { | 85 | void StartAudioRenderer(Kernel::HLERequestContext& ctx) { |
| @@ -87,7 +87,7 @@ private: | |||
| 87 | 87 | ||
| 88 | rb.Push(RESULT_SUCCESS); | 88 | rb.Push(RESULT_SUCCESS); |
| 89 | 89 | ||
| 90 | LOG_WARNING(Service_Audio, "(STUBBED) called"); | 90 | NGLOG_WARNING(Service_Audio, "(STUBBED) called"); |
| 91 | } | 91 | } |
| 92 | 92 | ||
| 93 | void StopAudioRenderer(Kernel::HLERequestContext& ctx) { | 93 | void StopAudioRenderer(Kernel::HLERequestContext& ctx) { |
| @@ -95,7 +95,7 @@ private: | |||
| 95 | 95 | ||
| 96 | rb.Push(RESULT_SUCCESS); | 96 | rb.Push(RESULT_SUCCESS); |
| 97 | 97 | ||
| 98 | LOG_WARNING(Service_Audio, "(STUBBED) called"); | 98 | NGLOG_WARNING(Service_Audio, "(STUBBED) called"); |
| 99 | } | 99 | } |
| 100 | 100 | ||
| 101 | void QuerySystemEvent(Kernel::HLERequestContext& ctx) { | 101 | void QuerySystemEvent(Kernel::HLERequestContext& ctx) { |
| @@ -105,7 +105,7 @@ private: | |||
| 105 | rb.Push(RESULT_SUCCESS); | 105 | rb.Push(RESULT_SUCCESS); |
| 106 | rb.PushCopyObjects(system_event); | 106 | rb.PushCopyObjects(system_event); |
| 107 | 107 | ||
| 108 | LOG_WARNING(Service_Audio, "(STUBBED) called"); | 108 | NGLOG_WARNING(Service_Audio, "(STUBBED) called"); |
| 109 | } | 109 | } |
| 110 | 110 | ||
| 111 | struct AudioRendererStateEntry { | 111 | struct AudioRendererStateEntry { |
| @@ -176,7 +176,7 @@ public: | |||
| 176 | 176 | ||
| 177 | private: | 177 | private: |
| 178 | void ListAudioDeviceName(Kernel::HLERequestContext& ctx) { | 178 | void ListAudioDeviceName(Kernel::HLERequestContext& ctx) { |
| 179 | LOG_WARNING(Service_Audio, "(STUBBED) called"); | 179 | NGLOG_WARNING(Service_Audio, "(STUBBED) called"); |
| 180 | IPC::RequestParser rp{ctx}; | 180 | IPC::RequestParser rp{ctx}; |
| 181 | 181 | ||
| 182 | const std::string audio_interface = "AudioInterface"; | 182 | const std::string audio_interface = "AudioInterface"; |
| @@ -188,7 +188,7 @@ private: | |||
| 188 | } | 188 | } |
| 189 | 189 | ||
| 190 | void SetAudioDeviceOutputVolume(Kernel::HLERequestContext& ctx) { | 190 | void SetAudioDeviceOutputVolume(Kernel::HLERequestContext& ctx) { |
| 191 | LOG_WARNING(Service_Audio, "(STUBBED) called"); | 191 | NGLOG_WARNING(Service_Audio, "(STUBBED) called"); |
| 192 | 192 | ||
| 193 | IPC::RequestParser rp{ctx}; | 193 | IPC::RequestParser rp{ctx}; |
| 194 | f32 volume = static_cast<f32>(rp.Pop<u32>()); | 194 | f32 volume = static_cast<f32>(rp.Pop<u32>()); |
| @@ -201,7 +201,7 @@ private: | |||
| 201 | } | 201 | } |
| 202 | 202 | ||
| 203 | void GetActiveAudioDeviceName(Kernel::HLERequestContext& ctx) { | 203 | void GetActiveAudioDeviceName(Kernel::HLERequestContext& ctx) { |
| 204 | LOG_WARNING(Service_Audio, "(STUBBED) called"); | 204 | NGLOG_WARNING(Service_Audio, "(STUBBED) called"); |
| 205 | IPC::RequestParser rp{ctx}; | 205 | IPC::RequestParser rp{ctx}; |
| 206 | 206 | ||
| 207 | const std::string audio_interface = "AudioDevice"; | 207 | const std::string audio_interface = "AudioDevice"; |
| @@ -213,7 +213,7 @@ private: | |||
| 213 | } | 213 | } |
| 214 | 214 | ||
| 215 | void QueryAudioDeviceSystemEvent(Kernel::HLERequestContext& ctx) { | 215 | void QueryAudioDeviceSystemEvent(Kernel::HLERequestContext& ctx) { |
| 216 | LOG_WARNING(Service_Audio, "(STUBBED) called"); | 216 | NGLOG_WARNING(Service_Audio, "(STUBBED) called"); |
| 217 | 217 | ||
| 218 | buffer_event->Signal(); | 218 | buffer_event->Signal(); |
| 219 | 219 | ||
| @@ -223,7 +223,7 @@ private: | |||
| 223 | } | 223 | } |
| 224 | 224 | ||
| 225 | void GetActiveChannelCount(Kernel::HLERequestContext& ctx) { | 225 | void GetActiveChannelCount(Kernel::HLERequestContext& ctx) { |
| 226 | LOG_WARNING(Service_Audio, "(STUBBED) called"); | 226 | NGLOG_WARNING(Service_Audio, "(STUBBED) called"); |
| 227 | IPC::ResponseBuilder rb{ctx, 3}; | 227 | IPC::ResponseBuilder rb{ctx, 3}; |
| 228 | rb.Push(RESULT_SUCCESS); | 228 | rb.Push(RESULT_SUCCESS); |
| 229 | rb.Push<u32>(1); | 229 | rb.Push<u32>(1); |
| @@ -250,7 +250,7 @@ void AudRenU::OpenAudioRenderer(Kernel::HLERequestContext& ctx) { | |||
| 250 | rb.Push(RESULT_SUCCESS); | 250 | rb.Push(RESULT_SUCCESS); |
| 251 | rb.PushIpcInterface<Audio::IAudioRenderer>(); | 251 | rb.PushIpcInterface<Audio::IAudioRenderer>(); |
| 252 | 252 | ||
| 253 | LOG_DEBUG(Service_Audio, "called"); | 253 | NGLOG_DEBUG(Service_Audio, "called"); |
| 254 | } | 254 | } |
| 255 | 255 | ||
| 256 | void AudRenU::GetAudioRendererWorkBufferSize(Kernel::HLERequestContext& ctx) { | 256 | void AudRenU::GetAudioRendererWorkBufferSize(Kernel::HLERequestContext& ctx) { |
| @@ -259,7 +259,7 @@ void AudRenU::GetAudioRendererWorkBufferSize(Kernel::HLERequestContext& ctx) { | |||
| 259 | rb.Push(RESULT_SUCCESS); | 259 | rb.Push(RESULT_SUCCESS); |
| 260 | rb.Push<u64>(0x400); | 260 | rb.Push<u64>(0x400); |
| 261 | 261 | ||
| 262 | LOG_WARNING(Service_Audio, "(STUBBED) called"); | 262 | NGLOG_WARNING(Service_Audio, "(STUBBED) called"); |
| 263 | } | 263 | } |
| 264 | 264 | ||
| 265 | void AudRenU::GetAudioDevice(Kernel::HLERequestContext& ctx) { | 265 | void AudRenU::GetAudioDevice(Kernel::HLERequestContext& ctx) { |
| @@ -268,7 +268,7 @@ void AudRenU::GetAudioDevice(Kernel::HLERequestContext& ctx) { | |||
| 268 | rb.Push(RESULT_SUCCESS); | 268 | rb.Push(RESULT_SUCCESS); |
| 269 | rb.PushIpcInterface<Audio::IAudioDevice>(); | 269 | rb.PushIpcInterface<Audio::IAudioDevice>(); |
| 270 | 270 | ||
| 271 | LOG_DEBUG(Service_Audio, "called"); | 271 | NGLOG_DEBUG(Service_Audio, "called"); |
| 272 | } | 272 | } |
| 273 | 273 | ||
| 274 | } // namespace Service::Audio | 274 | } // namespace Service::Audio |