diff options
| author | Peter Frühberger <Peter.Fruehberger@gmail.com> | 2013-12-28 05:03:57 -0800 |
|---|---|---|
| committer | Peter Frühberger <Peter.Fruehberger@gmail.com> | 2013-12-28 05:03:57 -0800 |
| commit | 7827d46554250ed893594e791750bb96f100b1f5 (patch) | |
| tree | 299d9747beb747b3fb997d2d09d6dd9020c2a961 | |
| parent | 97e915b8b5a9e93e5da61453604ef6b04c26e757 (diff) | |
| parent | b8177b998852a0d5a47ae61c663c09ad4353b0da (diff) | |
Merge pull request #3908 from fritsch/aefixes
ActiveAE: Fix Fixed Mode and some cosmetics
| -rw-r--r-- | xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp | 3 | ||||
| -rw-r--r-- | xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp | 10 |
2 files changed, 6 insertions, 7 deletions
diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp index 317d9e460f..97cfbc65cd 100644 --- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp +++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp @@ -2273,8 +2273,7 @@ bool CActiveAE::CompareFormat(AEAudioFormat &lhs, AEAudioFormat &rhs) { if (lhs.m_channelLayout != rhs.m_channelLayout || lhs.m_dataFormat != rhs.m_dataFormat || - lhs.m_sampleRate != rhs.m_sampleRate || - lhs.m_frames != rhs.m_frames) + lhs.m_sampleRate != rhs.m_sampleRate) return false; else return true; diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp index c2c5eb8e7a..7053313044 100644 --- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp +++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp @@ -438,7 +438,7 @@ void CActiveAESink::StateMachine(int signal, Protocol *port, Message *msg) break; default: // we are in no state, should not happen - CLog::Log(LOGERROR, "CActiveSink::%s - no valid state: %d", __FUNCTION__, m_state); + CLog::Log(LOGERROR, "CActiveAESink::%s - no valid state: %d", __FUNCTION__, m_state); return; } } // for @@ -639,7 +639,7 @@ void CActiveAESink::OpenSink() if (driver.empty() && m_sink) driver = m_sink->GetName(); - CLog::Log(LOGINFO, "CActiveAE::OpenSink - initialize sink"); + CLog::Log(LOGINFO, "CActiveAESink::OpenSink - initialize sink"); if (m_sink) { @@ -658,12 +658,12 @@ void CActiveAESink::OpenSink() // WARNING: this changes format and does not use passthrough m_sinkFormat = m_requestedFormat; - CLog::Log(LOGDEBUG, "CActiveAE::OpenSink - trying to open device %s", device.c_str()); + CLog::Log(LOGDEBUG, "CActiveAESink::OpenSink - trying to open device %s", device.c_str()); m_sink = CAESinkFactory::Create(device, m_sinkFormat, passthrough); if (!m_sink) { - CLog::Log(LOGERROR, "CActiveAE::OpenSink - no sink was returned"); + CLog::Log(LOGERROR, "CActiveAESink::OpenSink - no sink was returned"); m_extError = true; return; } @@ -682,7 +682,7 @@ void CActiveAESink::OpenSink() m_sinkFormat.m_dataFormat = AE_FMT_S32NE; #endif - CLog::Log(LOGDEBUG, "CActiveAE::OpenSink - %s Initialized:", m_sink->GetName()); + CLog::Log(LOGDEBUG, "CActiveAESink::OpenSink - %s Initialized:", m_sink->GetName()); CLog::Log(LOGDEBUG, " Output Device : %s", m_deviceFriendlyName.c_str()); CLog::Log(LOGDEBUG, " Sample Rate : %d", m_sinkFormat.m_sampleRate); CLog::Log(LOGDEBUG, " Sample Format : %s", CAEUtil::DataFormatToStr(m_sinkFormat.m_dataFormat)); |