diff options
| author | 2018-12-28 14:04:44 -0500 | |
|---|---|---|
| committer | 2018-12-28 14:13:58 -0500 | |
| commit | a73c7c73eb3c7edffd3c12e2becb55f86df1bc68 (patch) | |
| tree | 7abca8e2fb0aad44020f575a917f43e5471e9dca /src/audio_core/stream.cpp | |
| parent | Merge pull request #1951 from Tinob/master (diff) | |
| download | yuzu-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/audio_core/stream.cpp')
| -rw-r--r-- | src/audio_core/stream.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
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 | ||
| 50 | void Stream::Stop() { | 49 | void Stream::Stop() { |
| 51 | state = State::Stopped; | 50 | state = State::Stopped; |
| 52 | ASSERT_MSG(false, "Unimplemented"); | 51 | UNIMPLEMENTED(); |
| 53 | } | 52 | } |
| 54 | 53 | ||
| 55 | Stream::State Stream::GetState() const { | 54 | Stream::State Stream::GetState() const { |
| @@ -120,7 +119,7 @@ bool Stream::QueueBuffer(BufferPtr&& buffer) { | |||
| 120 | } | 119 | } |
| 121 | 120 | ||
| 122 | bool Stream::ContainsBuffer(Buffer::Tag tag) const { | 121 | bool Stream::ContainsBuffer(Buffer::Tag tag) const { |
| 123 | ASSERT_MSG(false, "Unimplemented"); | 122 | UNIMPLEMENTED(); |
| 124 | return {}; | 123 | return {}; |
| 125 | } | 124 | } |
| 126 | 125 | ||