Skip to content

Commit

Permalink
Merge pull request #16955 from fritsch/headphones
Browse files Browse the repository at this point in the history
Android: Backport of Headphone enumeration
  • Loading branch information
fritsch committed Dec 1, 2019
2 parents 37f51f6 + 774fcdd commit 1ff7e8d
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp
Expand Up @@ -328,7 +328,7 @@ bool CAESinkAUDIOTRACK::Initialize(AEAudioFormat &format, std::string &device)
}
}

if (m_format.m_dataFormat == AE_FMT_RAW && !CXBMCApp::IsHeadsetPlugged())
if (m_format.m_dataFormat == AE_FMT_RAW)
{
m_passthrough = true;
m_encoding = AEStreamFormatToATFormat(m_format.m_streamInfo.m_type);
Expand Down Expand Up @@ -872,11 +872,7 @@ void CAESinkAUDIOTRACK::EnumerateDevicesEx(AEDeviceInfoList &list, bool force)
m_info.m_displayNameExtra = "audiotrack";

UpdateAvailablePCMCapabilities();

if (!CXBMCApp::IsHeadsetPlugged())
{
UpdateAvailablePassthroughCapabilities();
}
UpdateAvailablePassthroughCapabilities();
list.push_back(m_info);
}

Expand Down

0 comments on commit 1ff7e8d

Please sign in to comment.