summaryrefslogtreecommitdiff
path: root/src/audio_core
diff options
context:
space:
mode:
authorGravatar bunnei2018-08-12 13:33:08 -0400
committerGravatar GitHub2018-08-12 13:33:08 -0400
commit68c44ca0ee17ed9f5319150e28c5dfa6115fb7b2 (patch)
tree8030e3696ed3ceebfb606ac119e5d9ff66ea8f58 /src/audio_core
parentMerge pull request #1034 from lioncash/hid (diff)
parentPushed the requested sample rate instead of our fixed sample rate (diff)
downloadyuzu-68c44ca0ee17ed9f5319150e28c5dfa6115fb7b2.tar.gz
yuzu-68c44ca0ee17ed9f5319150e28c5dfa6115fb7b2.tar.xz
yuzu-68c44ca0ee17ed9f5319150e28c5dfa6115fb7b2.zip
Merge pull request #1028 from ogniK5377/aoa
Added GetAudioRendererSampleRate, GetAudioRendererSampleCount & GetAudioRendererMixBufferCount
Diffstat (limited to 'src/audio_core')
-rw-r--r--src/audio_core/audio_renderer.cpp12
-rw-r--r--src/audio_core/audio_renderer.h5
2 files changed, 16 insertions, 1 deletions
diff --git a/src/audio_core/audio_renderer.cpp b/src/audio_core/audio_renderer.cpp
index 282f345c5..6ebed3fb0 100644
--- a/src/audio_core/audio_renderer.cpp
+++ b/src/audio_core/audio_renderer.cpp
@@ -26,6 +26,18 @@ AudioRenderer::AudioRenderer(AudioRendererParameter params,
26 QueueMixedBuffer(2); 26 QueueMixedBuffer(2);
27} 27}
28 28
29u32 AudioRenderer::GetSampleRate() const {
30 return worker_params.sample_rate;
31}
32
33u32 AudioRenderer::GetSampleCount() const {
34 return worker_params.sample_count;
35}
36
37u32 AudioRenderer::GetMixBufferCount() const {
38 return worker_params.mix_buffer_count;
39}
40
29std::vector<u8> AudioRenderer::UpdateAudioRenderer(const std::vector<u8>& input_params) { 41std::vector<u8> AudioRenderer::UpdateAudioRenderer(const std::vector<u8>& input_params) {
30 // Copy UpdateDataHeader struct 42 // Copy UpdateDataHeader struct
31 UpdateDataHeader config{}; 43 UpdateDataHeader config{};
diff --git a/src/audio_core/audio_renderer.h b/src/audio_core/audio_renderer.h
index 6950a4681..13c5d0adc 100644
--- a/src/audio_core/audio_renderer.h
+++ b/src/audio_core/audio_renderer.h
@@ -26,7 +26,7 @@ enum class PlayState : u8 {
26struct AudioRendererParameter { 26struct AudioRendererParameter {
27 u32_le sample_rate; 27 u32_le sample_rate;
28 u32_le sample_count; 28 u32_le sample_count;
29 u32_le unknown_8; 29 u32_le mix_buffer_count;
30 u32_le unknown_c; 30 u32_le unknown_c;
31 u32_le voice_count; 31 u32_le voice_count;
32 u32_le sink_count; 32 u32_le sink_count;
@@ -160,6 +160,9 @@ public:
160 std::vector<u8> UpdateAudioRenderer(const std::vector<u8>& input_params); 160 std::vector<u8> UpdateAudioRenderer(const std::vector<u8>& input_params);
161 void QueueMixedBuffer(Buffer::Tag tag); 161 void QueueMixedBuffer(Buffer::Tag tag);
162 void ReleaseAndQueueBuffers(); 162 void ReleaseAndQueueBuffers();
163 u32 GetSampleRate() const;
164 u32 GetSampleCount() const;
165 u32 GetMixBufferCount() const;
163 166
164private: 167private:
165 class VoiceState { 168 class VoiceState {