diff options
| author | bunnei <bunneidev@gmail.com> | 2019-02-25 18:25:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-25 18:25:36 -0500 |
| commit | 1cffd3848b15f86da3ba6b7a371602ecffb8cac2 (patch) | |
| tree | e39ba2ad2d35a84312dc06e1abc2f1def3c556b1 | |
| parent | 93c163057073e03c03459fe14bb95004b33101ef (diff) | |
| parent | 04d7b7e09d7ae6db878a4f9d768de82d2b906efa (diff) | |
Merge pull request #2160 from lioncash/audio-warn
audio_core: Resolve compilation warnings
| -rw-r--r-- | src/audio_core/codec.cpp | 4 | ||||
| -rw-r--r-- | src/audio_core/cubeb_sink.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/audio_core/codec.cpp b/src/audio_core/codec.cpp index 454de798b0..c5a0d98cec 100644 --- a/src/audio_core/codec.cpp +++ b/src/audio_core/codec.cpp @@ -68,8 +68,8 @@ std::vector<s16> DecodeADPCM(const u8* const data, std::size_t size, const ADPCM } } - state.yn1 = yn1; - state.yn2 = yn2; + state.yn1 = static_cast<s16>(yn1); + state.yn2 = static_cast<s16>(yn2); return ret; } diff --git a/src/audio_core/cubeb_sink.cpp b/src/audio_core/cubeb_sink.cpp index 097328901d..dc45dedd39 100644 --- a/src/audio_core/cubeb_sink.cpp +++ b/src/audio_core/cubeb_sink.cpp @@ -46,7 +46,7 @@ public: } } - ~CubebSinkStream() { + ~CubebSinkStream() override { if (!ctx) { return; } @@ -75,11 +75,11 @@ public: queue.Push(samples); } - std::size_t SamplesInQueue(u32 num_channels) const override { + std::size_t SamplesInQueue(u32 channel_count) const override { if (!ctx) return 0; - return queue.Size() / num_channels; + return queue.Size() / channel_count; } void Flush() override { @@ -98,7 +98,7 @@ private: u32 num_channels{}; Common::RingBuffer<s16, 0x10000> queue; - std::array<s16, 2> last_frame; + std::array<s16, 2> last_frame{}; std::atomic<bool> should_flush{}; TimeStretcher time_stretch; |