aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamian Huckle <damianhuckle@hotmail.com>2012-08-31 22:34:41 -0700
committerDamian Huckle <damianhuckle@hotmail.com>2012-08-31 22:34:41 -0700
commit12840c28d8fbfd71c26be798ff6b13828b05b168 (patch)
tree8dbbf9c3089592bd88166e6585aaa35323fd3dc9
parent4f9f8e7f24647dbca8683df9b91e3a21aa77502f (diff)
parent9f8d76857ccd5da5708c56b2b38dd5e8b6272521 (diff)
Merge pull request #1344 from fritsch/xbmc-upstreamFrodo_alpha5
[AE] - Make sure, that m_channelLayout is updated, when user has set too...
-rw-r--r--xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
index f37c9a9fac..6d653a372b 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
@@ -257,8 +257,7 @@ bool CAESinkALSA::InitializeHW(AEAudioFormat &format)
/* ensure we opened X channels or more */
if (format.m_channelLayout.Count() > channelCount)
{
- CLog::Log(LOGERROR, "CAESinkALSA::InitializeHW - Unable to open the required number of channels");
- return false;
+ CLog::Log(LOGINFO, "CAESinkALSA::InitializeHW - Unable to open the required number of channels");
}
/* update the channelLayout to what we managed to open */