Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ActiveAE: Compare correct list that matches the sinkName #4200

Merged
merged 1 commit into from
Feb 13, 2014
Merged

ActiveAE: Compare correct list that matches the sinkName #4200

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -114,17 +114,20 @@ bool CActiveAESink::SupportsFormat(const std::string &device, AEDataFormat forma
CAESinkFactory::ParseDevice(dev, dri); CAESinkFactory::ParseDevice(dev, dri);
for (AESinkInfoList::iterator itt = m_sinkInfoList.begin(); itt != m_sinkInfoList.end(); ++itt) for (AESinkInfoList::iterator itt = m_sinkInfoList.begin(); itt != m_sinkInfoList.end(); ++itt)
{ {
for (AEDeviceInfoList::iterator itt2 = itt->m_deviceInfoList.begin(); itt2 != itt->m_deviceInfoList.end(); ++itt2) if (dri == itt->m_sinkName)
{ {
CAEDeviceInfo& info = *itt2; for (AEDeviceInfoList::iterator itt2 = itt->m_deviceInfoList.begin(); itt2 != itt->m_deviceInfoList.end(); ++itt2)
if (info.m_deviceName == dev)
{ {
AEDataFormatList::iterator itt3; CAEDeviceInfo& info = *itt2;
itt3 = find(info.m_dataFormats.begin(), info.m_dataFormats.end(), format); if (info.m_deviceName == dev)
if (itt3 != info.m_dataFormats.end()) {
return true; AEDataFormatList::iterator itt3;
else itt3 = find(info.m_dataFormats.begin(), info.m_dataFormats.end(), format);
return false; if (itt3 != info.m_dataFormats.end())
return true;
else
return false;
}
} }
} }
} }
Expand Down