diff options
| author | Peter Frühberger <Peter.Fruehberger@gmail.com> | 2016-09-17 13:32:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-17 13:32:24 +0200 |
| commit | 56423ffa3a89d5750a053cd55a6fd36221176f7f (patch) | |
| tree | 7f21d7687d49a7a33a9ae0356d0df6410ba3bddb | |
| parent | e36734747739f52df6c9efe012253484ff163de0 (diff) | |
| parent | 9a82a0dce4134f57e402e72bfb70335d1c8a6ab1 (diff) | |
Merge pull request #10477 from fritsch/devcon16
AE-Fixes: Viz and removal of unused code
| -rw-r--r-- | xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp | 1 | ||||
| -rw-r--r-- | xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp index 08e7991982..5b2243f309 100644 --- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp +++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp @@ -1317,6 +1317,7 @@ void CActiveAE::Configure(AEAudioFormat *desiredFmt) AEAudioFormat vizFormat = m_internalFormat; vizFormat.m_channelLayout = AE_CH_LAYOUT_2_0; vizFormat.m_dataFormat = AE_FMT_FLOAT; + vizFormat.m_sampleRate = 44100; // input buffers m_vizBuffersInput = new CActiveAEBufferPool(m_internalFormat); diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp index 3ca667c2be..362fae6d4e 100644 --- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp +++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp @@ -737,12 +737,6 @@ bool CActiveAEBufferPoolAtempo::ProcessBuffers() } else if (m_procSample || !m_freeSamples.empty()) { - int free_samples; - if (m_procSample) - free_samples = m_procSample->pkt->max_nb_samples - m_procSample->pkt->nb_samples; - else - free_samples = m_format.m_frames; - bool skipInput = false; // avoid that bufferscr grows too large |