aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Marshall <jmarshall@xbmc.org>2014-05-25 10:50:24 +1200
committerJonathan Marshall <jmarshall@never.you.mind>2014-05-26 09:41:19 +1200
commitf1d8237638f3e9cb3bd09bb49ff9da5f448095d7 (patch)
treeefcaf267e63c073c7aa108495fc7de5486acc6ce
parent5399c0525c288fc81f242259d1e9398612eb03df (diff)
[ios/osx] drop unused IsCompatible() functions from darwin audio sinks
-rw-r--r--xbmc/cores/AudioEngine/Sinks/AESinkDARWINIOS.cpp7
-rw-r--r--xbmc/cores/AudioEngine/Sinks/AESinkDARWINIOS.h1
-rw-r--r--xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.cpp8
-rw-r--r--xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.h4
4 files changed, 0 insertions, 20 deletions
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkDARWINIOS.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkDARWINIOS.cpp
index 7f40ab94cd..8289d9a53e 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkDARWINIOS.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkDARWINIOS.cpp
@@ -685,13 +685,6 @@ void CAESinkDARWINIOS::Deinitialize()
m_audioSink = NULL;
}
-bool CAESinkDARWINIOS::IsCompatible(const AEAudioFormat &format, const std::string &device)
-{
- return ((m_format.m_sampleRate == format.m_sampleRate) &&
- (m_format.m_dataFormat == format.m_dataFormat) &&
- (m_format.m_channelLayout == format.m_channelLayout));
-}
-
double CAESinkDARWINIOS::GetDelay()
{
if (m_audioSink)
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkDARWINIOS.h b/xbmc/cores/AudioEngine/Sinks/AESinkDARWINIOS.h
index af10d0e932..55acd4234f 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkDARWINIOS.h
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkDARWINIOS.h
@@ -44,7 +44,6 @@ public:
virtual bool Initialize(AEAudioFormat &format, std::string &device);
virtual void Deinitialize();
- virtual bool IsCompatible(const AEAudioFormat &format, const std::string &device);
virtual double GetDelay ();
virtual double GetCacheTotal ();
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.cpp
index 9999b2bfa6..26fc6ed502 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.cpp
@@ -608,7 +608,6 @@ bool CAESinkDARWINOSX::Initialize(AEAudioFormat &format, std::string &device)
m_buffer = new AERingBuffer(num_buffers * format.m_frames * m_frameSizePerPlane, m_planes);
CLog::Log(LOGDEBUG, "%s: using buffer size: %u (%f ms)", __FUNCTION__, m_buffer->GetMaxSize(), (float)m_buffer->GetMaxSize() / (m_framesPerSecond * m_frameSizePerPlane));
- m_format = format;
if (passthrough)
format.m_dataFormat = AE_FMT_S16NE;
else
@@ -663,13 +662,6 @@ void CAESinkDARWINOSX::Deinitialize()
m_started = false;
}
-bool CAESinkDARWINOSX::IsCompatible(const AEAudioFormat &format, const std::string &device)
-{
- return ((m_format.m_sampleRate == format.m_sampleRate) &&
- (m_format.m_dataFormat == format.m_dataFormat) &&
- (m_format.m_channelLayout == format.m_channelLayout));
-}
-
double CAESinkDARWINOSX::GetDelay()
{
if (m_buffer)
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.h b/xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.h
index a0fc946f8b..a33ca54bb0 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.h
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.h
@@ -36,7 +36,6 @@ public:
virtual bool Initialize(AEAudioFormat &format, std::string &device);
virtual void Deinitialize();
- virtual bool IsCompatible(const AEAudioFormat &format, const std::string &device);
virtual double GetDelay ();
virtual double GetCacheTotal ();
@@ -49,9 +48,6 @@ private:
void SetHogMode(bool on);
CAEDeviceInfo m_info;
- AEAudioFormat m_format;
-
- volatile bool m_draining;
CCoreAudioDevice m_device;
CCoreAudioStream m_outputStream;