summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Lioncash2018-12-28 14:04:44 -0500
committerGravatar Lioncash2018-12-28 14:13:58 -0500
commita73c7c73eb3c7edffd3c12e2becb55f86df1bc68 (patch)
tree7abca8e2fb0aad44020f575a917f43e5471e9dca /src
parentMerge pull request #1951 from Tinob/master (diff)
downloadyuzu-a73c7c73eb3c7edffd3c12e2becb55f86df1bc68.tar.gz
yuzu-a73c7c73eb3c7edffd3c12e2becb55f86df1bc68.tar.xz
yuzu-a73c7c73eb3c7edffd3c12e2becb55f86df1bc68.zip
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.cpp3
-rw-r--r--src/audio_core/audio_renderer.cpp6
-rw-r--r--src/audio_core/stream.cpp7
3 files changed, 6 insertions, 10 deletions
diff --git a/src/audio_core/audio_out.cpp b/src/audio_core/audio_out.cpp
index cbba17632..50d2a1ed3 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) {
22 return Stream::Format::Multi51Channel16; 22 return Stream::Format::Multi51Channel16;
23 } 23 }
24 24
25 LOG_CRITICAL(Audio, "Unimplemented num_channels={}", num_channels); 25 UNIMPLEMENTED_MSG("Unimplemented num_channels={}", num_channels);
26 UNREACHABLE();
27 return {}; 26 return {};
28} 27}
29 28
diff --git a/src/audio_core/audio_renderer.cpp b/src/audio_core/audio_renderer.cpp
index 2683f3a5f..00c026511 100644
--- a/src/audio_core/audio_renderer.cpp
+++ b/src/audio_core/audio_renderer.cpp
@@ -260,8 +260,7 @@ void AudioRenderer::VoiceState::RefreshBuffer() {
260 break; 260 break;
261 } 261 }
262 default: 262 default:
263 LOG_CRITICAL(Audio, "Unimplemented sample_format={}", info.sample_format); 263 UNIMPLEMENTED_MSG("Unimplemented sample_format={}", info.sample_format);
264 UNREACHABLE();
265 break; 264 break;
266 } 265 }
267 266
@@ -280,8 +279,7 @@ void AudioRenderer::VoiceState::RefreshBuffer() {
280 break; 279 break;
281 } 280 }
282 default: 281 default:
283 LOG_CRITICAL(Audio, "Unimplemented channel_count={}", info.channel_count); 282 UNIMPLEMENTED_MSG("Unimplemented channel_count={}", info.channel_count);
284 UNREACHABLE();
285 break; 283 break;
286 } 284 }
287 285
diff --git a/src/audio_core/stream.cpp b/src/audio_core/stream.cpp
index f35628e45..874673c4e 100644
--- a/src/audio_core/stream.cpp
+++ b/src/audio_core/stream.cpp
@@ -28,8 +28,7 @@ u32 Stream::GetNumChannels() const {
28 case Format::Multi51Channel16: 28 case Format::Multi51Channel16:
29 return 6; 29 return 6;
30 } 30 }
31 LOG_CRITICAL(Audio, "Unimplemented format={}", static_cast<u32>(format)); 31 UNIMPLEMENTED_MSG("Unimplemented format={}", static_cast<u32>(format));
32 UNREACHABLE();
33 return {}; 32 return {};
34} 33}
35 34
@@ -49,7 +48,7 @@ void Stream::Play() {
49 48
50void Stream::Stop() { 49void Stream::Stop() {
51 state = State::Stopped; 50 state = State::Stopped;
52 ASSERT_MSG(false, "Unimplemented"); 51 UNIMPLEMENTED();
53} 52}
54 53
55Stream::State Stream::GetState() const { 54Stream::State Stream::GetState() const {
@@ -120,7 +119,7 @@ bool Stream::QueueBuffer(BufferPtr&& buffer) {
120} 119}
121 120
122bool Stream::ContainsBuffer(Buffer::Tag tag) const { 121bool Stream::ContainsBuffer(Buffer::Tag tag) const {
123 ASSERT_MSG(false, "Unimplemented"); 122 UNIMPLEMENTED();
124 return {}; 123 return {};
125} 124}
126 125