purgatory/yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2160 from lioncash/audio-warn

Browse Source 
audio_core: Resolve compilation warnings
This commit is contained in:
bunnei 2019-02-25 18:25:36 -05:00 committed by GitHub
commit 1cffd3848b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/audio_core/codec.cpp
View File

@ -68,8 +68,8 @@ std::vector<s16> DecodeADPCM(const u8* const data, std::size_t size, const ADPCM
} }
} }
state.yn1 = yn1; state.yn1 = static_cast<s16>(yn1);
state.yn2 = yn2; state.yn2 = static_cast<s16>(yn2);
return ret; return ret;
} }

8
src/audio_core/cubeb_sink.cpp
View File

@ -46,7 +46,7 @@ public:
} }
} }
~CubebSinkStream() { ~CubebSinkStream() override {
if (!ctx) { if (!ctx) {
return; return;
} }
@ -75,11 +75,11 @@ public:
queue.Push(samples); queue.Push(samples);
} }
std::size_t SamplesInQueue(u32 num_channels) const override { std::size_t SamplesInQueue(u32 channel_count) const override {
if (!ctx) if (!ctx)
return 0; return 0;
return queue.Size() / num_channels; return queue.Size() / channel_count;
} }
void Flush() override { void Flush() override {
@ -98,7 +98,7 @@ private:
u32 num_channels{}; u32 num_channels{};
Common::RingBuffer<s16, 0x10000> queue; Common::RingBuffer<s16, 0x10000> queue;
std::array<s16, 2> last_frame; std::array<s16, 2> last_frame{};
std::atomic<bool> should_flush{}; std::atomic<bool> should_flush{};
TimeStretcher time_stretch; TimeStretcher time_stretch;