summaryrefslogtreecommitdiff
path: root/src/audio_core/sdl2_sink.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2016-08-31 22:19:38 -0400
committerGravatar GitHub2016-08-31 22:19:38 -0400
commit549d0c171563423f024de754a82ab033d31294d1 (patch)
tree547ec290bfa04497c63f10603d801e473a0b1f84 /src/audio_core/sdl2_sink.cpp
parentMerge pull request #2034 from JayFoxRox/avoid-glsl-error (diff)
parentconfigure_audio: User-configuratble option to enable/disable audio stretching (diff)
downloadyuzu-549d0c171563423f024de754a82ab033d31294d1.tar.gz
yuzu-549d0c171563423f024de754a82ab033d31294d1.tar.xz
yuzu-549d0c171563423f024de754a82ab033d31294d1.zip
Merge pull request #2035 from MerryMage/disable-stretch
User-configurable option to enable/disable time-stretching of audio
Diffstat (limited to 'src/audio_core/sdl2_sink.cpp')
-rw-r--r--src/audio_core/sdl2_sink.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/audio_core/sdl2_sink.cpp b/src/audio_core/sdl2_sink.cpp
index dc75c04ee..311dd5b59 100644
--- a/src/audio_core/sdl2_sink.cpp
+++ b/src/audio_core/sdl2_sink.cpp
@@ -71,14 +71,12 @@ unsigned int SDL2Sink::GetNativeSampleRate() const {
71 return impl->sample_rate; 71 return impl->sample_rate;
72} 72}
73 73
74void SDL2Sink::EnqueueSamples(const std::vector<s16>& samples) { 74void SDL2Sink::EnqueueSamples(const s16* samples, size_t sample_count) {
75 if (impl->audio_device_id <= 0) 75 if (impl->audio_device_id <= 0)
76 return; 76 return;
77 77
78 ASSERT_MSG(samples.size() % 2 == 0, "Samples must be in interleaved stereo PCM16 format (size must be a multiple of two)");
79
80 SDL_LockAudioDevice(impl->audio_device_id); 78 SDL_LockAudioDevice(impl->audio_device_id);
81 impl->queue.emplace_back(samples); 79 impl->queue.emplace_back(samples, samples + sample_count * 2);
82 SDL_UnlockAudioDevice(impl->audio_device_id); 80 SDL_UnlockAudioDevice(impl->audio_device_id);
83} 81}
84 82