diff options
| author | thexai <58434170+thexai@users.noreply.github.com> | 2024-04-27 20:46:24 +0200 |
|---|---|---|
| committer | thexai <58434170+thexai@users.noreply.github.com> | 2024-09-16 17:23:13 +0200 |
| commit | 6e79be32773e7e094690d309cba81cea53ee4f82 (patch) | |
| tree | 832eb1771fead215924843ea6c42098affc5feae | |
| parent | 605a78540eb9c65b0f63eaa5325b6fa97aaa101b (diff) | |
XAudio: remove updated but not read member variables
| -rw-r--r-- | xbmc/cores/AudioEngine/Sinks/AESinkXAudio.cpp | 12 | ||||
| -rw-r--r-- | xbmc/cores/AudioEngine/Sinks/AESinkXAudio.h | 3 |
2 files changed, 3 insertions, 12 deletions
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkXAudio.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkXAudio.cpp index 6afc96b719..fb1be8af2c 100644 --- a/xbmc/cores/AudioEngine/Sinks/AESinkXAudio.cpp +++ b/xbmc/cores/AudioEngine/Sinks/AESinkXAudio.cpp @@ -52,8 +52,6 @@ inline void SafeDestroyVoice(TVoice **ppVoice) CAESinkXAudio::CAESinkXAudio() { - m_channelLayout.Reset(); - HRESULT hr = XAudio2Create(m_xAudio2.ReleaseAndGetAddressOf(), 0); if (FAILED(hr)) { @@ -729,13 +727,9 @@ bool CAESinkXAudio::InitializeInternal(std::string deviceId, AEAudioFormat &form initialize: - CAESinkFactoryWin::AEChannelsFromSpeakerMask(m_channelLayout, wfxex.dwChannelMask); - format.m_channelLayout = m_channelLayout; - - /* When the stream is raw, the values in the format structure are set to the link */ - /* parameters, so store the encoded stream values here for the IsCompatible function */ - m_encodedChannels = wfxex.Format.nChannels; - m_encodedSampleRate = (format.m_dataFormat == AE_FMT_RAW) ? format.m_streamInfo.m_sampleRate : format.m_sampleRate; + CAEChannelInfo channelLayout; + CAESinkFactoryWin::AEChannelsFromSpeakerMask(channelLayout, wfxex.dwChannelMask); + format.m_channelLayout = channelLayout; /* Set up returned sink format for engine */ if (format.m_dataFormat != AE_FMT_RAW) diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkXAudio.h b/xbmc/cores/AudioEngine/Sinks/AESinkXAudio.h index 30c4fe92b2..da9c2dc85b 100644 --- a/xbmc/cores/AudioEngine/Sinks/AESinkXAudio.h +++ b/xbmc/cores/AudioEngine/Sinks/AESinkXAudio.h @@ -134,9 +134,6 @@ private: VoiceCallback m_voiceCallback; AEAudioFormat m_format; - unsigned int m_encodedChannels{0}; - unsigned int m_encodedSampleRate{0}; - CAEChannelInfo m_channelLayout; unsigned int m_AvgBytesPerSec{0}; unsigned int m_dwChunkSize{0}; |