diff options
| author | 2018-08-12 14:58:36 +1000 | |
|---|---|---|
| committer | 2018-08-12 14:58:36 +1000 | |
| commit | 094f6003e07cbb2c42142787d52fe6e59b3918cb (patch) | |
| tree | 23792398894000761c422e21226823c672d1aeef | |
| parent | Added GetAudioRendererSampleRate, GetAudioRendererSampleCount & GetAudioRende... (diff) | |
| download | yuzu-094f6003e07cbb2c42142787d52fe6e59b3918cb.tar.gz yuzu-094f6003e07cbb2c42142787d52fe6e59b3918cb.tar.xz yuzu-094f6003e07cbb2c42142787d52fe6e59b3918cb.zip | |
Pushed the requested sample rate instead of our fixed sample rate
| -rw-r--r-- | src/audio_core/audio_renderer.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/service/audio/audren_u.cpp | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/audio_core/audio_renderer.cpp b/src/audio_core/audio_renderer.cpp index 1ab6e88c2..6ebed3fb0 100644 --- a/src/audio_core/audio_renderer.cpp +++ b/src/audio_core/audio_renderer.cpp | |||
| @@ -27,7 +27,7 @@ AudioRenderer::AudioRenderer(AudioRendererParameter params, | |||
| 27 | } | 27 | } |
| 28 | 28 | ||
| 29 | u32 AudioRenderer::GetSampleRate() const { | 29 | u32 AudioRenderer::GetSampleRate() const { |
| 30 | return STREAM_SAMPLE_RATE; | 30 | return worker_params.sample_rate; |
| 31 | } | 31 | } |
| 32 | 32 | ||
| 33 | u32 AudioRenderer::GetSampleCount() const { | 33 | u32 AudioRenderer::GetSampleCount() const { |
diff --git a/src/core/hle/service/audio/audren_u.cpp b/src/core/hle/service/audio/audren_u.cpp index 4bdac8067..0b6034bb3 100644 --- a/src/core/hle/service/audio/audren_u.cpp +++ b/src/core/hle/service/audio/audren_u.cpp | |||
| @@ -48,10 +48,8 @@ private: | |||
| 48 | void GetAudioRendererSampleRate(Kernel::HLERequestContext& ctx) { | 48 | void GetAudioRendererSampleRate(Kernel::HLERequestContext& ctx) { |
| 49 | IPC::ResponseBuilder rb{ctx, 3}; | 49 | IPC::ResponseBuilder rb{ctx, 3}; |
| 50 | rb.Push(RESULT_SUCCESS); | 50 | rb.Push(RESULT_SUCCESS); |
| 51 | rb.Push<u32>( | 51 | rb.Push<u32>(renderer->GetSampleRate()); |
| 52 | renderer->GetSampleRate()); // Switch uses the worker_params value, but we always | 52 | LOG_DEBUG(Service_Audio, "called"); |
| 53 | // have a fixed sample rate so return that instead | ||
| 54 | LOG_WARNING(Service_Audio, "(STUBBED) called"); | ||
| 55 | } | 53 | } |
| 56 | 54 | ||
| 57 | void GetAudioRendererSampleCount(Kernel::HLERequestContext& ctx) { | 55 | void GetAudioRendererSampleCount(Kernel::HLERequestContext& ctx) { |