diff options
| author |  Zach Hilman | 2019-06-05 15:52:37 -0400 |
|---|---|---|
| committer |  GitHub | 2019-06-05 15:52:37 -0400 |
| commit | 81e09bb1213720c31b7881c9396385375dac5749 (patch) | |
| tree | 06ea501a4f516ac82f1ac91f953d4325475940bc /src/audio_core/stream.cpp | |
| parent | Merge pull request #2541 from lioncash/input (diff) | |
| parent | core/core_timing_util: Amend casing of cyclesTo* functions (diff) | |
| download | yuzu-81e09bb1213720c31b7881c9396385375dac5749.tar.gz yuzu-81e09bb1213720c31b7881c9396385375dac5749.tar.xz yuzu-81e09bb1213720c31b7881c9396385375dac5749.zip | |
Merge pull request #2545 from lioncash/timing
core/core_timing_util: Use std::chrono types for specifying time units
Diffstat (limited to 'src/audio_core/stream.cpp')
| -rw-r--r-- | src/audio_core/stream.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/audio_core/stream.cpp b/src/audio_core/stream.cpp index 22a3f8c84..11481a776 100644 --- a/src/audio_core/stream.cpp +++ b/src/audio_core/stream.cpp | |||
| @@ -57,7 +57,9 @@ Stream::State Stream::GetState() const { | |||
| 57 | 57 | ||
| 58 | s64 Stream::GetBufferReleaseCycles(const Buffer& buffer) const { | 58 | s64 Stream::GetBufferReleaseCycles(const Buffer& buffer) const { |
| 59 | const std::size_t num_samples{buffer.GetSamples().size() / GetNumChannels()}; | 59 | const std::size_t num_samples{buffer.GetSamples().size() / GetNumChannels()}; |
| 60 | return Core::Timing::usToCycles((static_cast<u64>(num_samples) * 1000000) / sample_rate); | 60 | const auto us = |
| 61 | std::chrono::microseconds((static_cast<u64>(num_samples) * 1000000) / sample_rate); | ||
| 62 | return Core::Timing::usToCycles(us); | ||
| 61 | } | 63 | } |
| 62 | 64 | ||
| 63 | static void VolumeAdjustSamples(std::vector<s16>& samples) { | 65 | static void VolumeAdjustSamples(std::vector<s16>& samples) { |