From: Martijn Kaijser Date: Sun, 4 Aug 2013 15:30:00 +0000 (-0700) Subject: Merge pull request #2703 from ace20022/cores_revised X-Git-Tag: Gotham_alpha7~161 X-Git-Url: http://code.vuplus.com/gitweb/?a=commitdiff_plain;h=c6a2d83a2cd378163f753065375ef8700e70a661;p=vuplus_xbmc Merge pull request #2703 from ace20022/cores_revised [Cores] Revised with cppcheck --- c6a2d83a2cd378163f753065375ef8700e70a661 diff --cc xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.h index a6f2912,630e7c9..baddaea --- a/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.h +++ b/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.h @@@ -36,10 -36,9 +36,10 @@@ public virtual bool Initialize (AEAudioFormat &format, std::string &device); virtual void Deinitialize(); - virtual bool IsCompatible(const AEAudioFormat format, const std::string &device); + virtual bool IsCompatible(const AEAudioFormat &format, const std::string &device); virtual void Stop (); + virtual void Drain (); virtual double GetDelay (); virtual double GetCacheTime (); virtual double GetCacheTotal (); diff --cc xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.cpp index 38065cd,e06bbde..ef43428 --- a/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.cpp +++ b/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.cpp @@@ -370,12 -351,9 +370,12 @@@ void CAESinkWASAPI::Deinitialize( SAFE_RELEASE(m_pDevice); m_initialized = false; + + delete [] m_pBuffer; + m_bufferPtr = 0; } - bool CAESinkWASAPI::IsCompatible(const AEAudioFormat format, const std::string &device) + bool CAESinkWASAPI::IsCompatible(const AEAudioFormat &format, const std::string &device) { if (!m_initialized || m_isDirty) return false;