diff options
| author | Lioncash <mathew1800@gmail.com> | 2018-12-28 14:04:44 -0500 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2018-12-28 14:13:58 -0500 |
| commit | a73c7c73eb3c7edffd3c12e2becb55f86df1bc68 (patch) | |
| tree | 7abca8e2fb0aad44020f575a917f43e5471e9dca /src | |
| parent | e84e4fd3f8f3d42a37206ea743fac35f5161ea14 (diff) | |
audio_core: Convert LOG_CRITICAL + UNREACHABLE over to UNIMPLEMENTED/UNIMPLEMENTED_MSG
These two macros being used in tandem were used prior to the
introduction of UNIMPLEMENTED and UNIMPLEMENTED_MSG. This provides
equivalent behavior, just with less typing/reading involved.
Diffstat (limited to 'src')
| -rw-r--r-- | src/audio_core/audio_out.cpp | 3 | ||||
| -rw-r--r-- | src/audio_core/audio_renderer.cpp | 6 | ||||
| -rw-r--r-- | src/audio_core/stream.cpp | 7 |
3 files changed, 6 insertions, 10 deletions
diff --git a/src/audio_core/audio_out.cpp b/src/audio_core/audio_out.cpp index cbba17632f..50d2a1ed35 100644 --- a/src/audio_core/audio_out.cpp +++ b/src/audio_core/audio_out.cpp @@ -22,8 +22,7 @@ static Stream::Format ChannelsToStreamFormat(u32 num_channels) { return Stream::Format::Multi51Channel16; } - LOG_CRITICAL(Audio, "Unimplemented num_channels={}", num_channels); - UNREACHABLE(); + UNIMPLEMENTED_MSG("Unimplemented num_channels={}", num_channels); return {}; } diff --git a/src/audio_core/audio_renderer.cpp b/src/audio_core/audio_renderer.cpp index 2683f3a5fa..00c0265110 100644 --- a/src/audio_core/audio_renderer.cpp +++ b/src/audio_core/audio_renderer.cpp @@ -260,8 +260,7 @@ void AudioRenderer::VoiceState::RefreshBuffer() { break; } default: - LOG_CRITICAL(Audio, "Unimplemented sample_format={}", info.sample_format); - UNREACHABLE(); + UNIMPLEMENTED_MSG("Unimplemented sample_format={}", info.sample_format); break; } @@ -280,8 +279,7 @@ void AudioRenderer::VoiceState::RefreshBuffer() { break; } default: - LOG_CRITICAL(Audio, "Unimplemented channel_count={}", info.channel_count); - UNREACHABLE(); + UNIMPLEMENTED_MSG("Unimplemented channel_count={}", info.channel_count); break; } diff --git a/src/audio_core/stream.cpp b/src/audio_core/stream.cpp index f35628e45f..874673c4e5 100644 --- a/src/audio_core/stream.cpp +++ b/src/audio_core/stream.cpp @@ -28,8 +28,7 @@ u32 Stream::GetNumChannels() const { case Format::Multi51Channel16: return 6; } - LOG_CRITICAL(Audio, "Unimplemented format={}", static_cast<u32>(format)); - UNREACHABLE(); + UNIMPLEMENTED_MSG("Unimplemented format={}", static_cast<u32>(format)); return {}; } @@ -49,7 +48,7 @@ void Stream::Play() { void Stream::Stop() { state = State::Stopped; - ASSERT_MSG(false, "Unimplemented"); + UNIMPLEMENTED(); } Stream::State Stream::GetState() const { @@ -120,7 +119,7 @@ bool Stream::QueueBuffer(BufferPtr&& buffer) { } bool Stream::ContainsBuffer(Buffer::Tag tag) const { - ASSERT_MSG(false, "Unimplemented"); + UNIMPLEMENTED(); return {}; } |