ActiveAE.cpp (xbmc-18.7.1-Leia) | : | ActiveAE.cpp (xbmc-18.8-Leia) | ||
---|---|---|---|---|
skipping to change at line 598 | skipping to change at line 598 | |||
m_extTimeout = 0; | m_extTimeout = 0; | |||
// don't accept any data until we are reconfigured | // don't accept any data until we are reconfigured | |||
m_extDeferData = true; | m_extDeferData = true; | |||
return; | return; | |||
} | } | |||
case CActiveAEControlProtocol::SUSPEND: | case CActiveAEControlProtocol::SUSPEND: | |||
UnconfigureSink(); | UnconfigureSink(); | |||
m_stats.SetSuspended(true); | m_stats.SetSuspended(true); | |||
m_state = AE_TOP_CONFIGURED_SUSPEND; | m_state = AE_TOP_CONFIGURED_SUSPEND; | |||
m_extDeferData = true; | m_extDeferData = true; | |||
m_extSuspended = true; | ||||
return; | return; | |||
case CActiveAEControlProtocol::DISPLAYLOST: | case CActiveAEControlProtocol::DISPLAYLOST: | |||
if (m_sink.GetDeviceType(m_mode == MODE_PCM ? m_settings.device : m_se ttings.passthroughdevice) == AE_DEVTYPE_HDMI) | if (m_sink.GetDeviceType(m_mode == MODE_PCM ? m_settings.device : m_se ttings.passthroughdevice) == AE_DEVTYPE_HDMI) | |||
{ | { | |||
UnconfigureSink(); | UnconfigureSink(); | |||
m_stats.SetSuspended(true); | m_stats.SetSuspended(true); | |||
m_state = AE_TOP_CONFIGURED_SUSPEND; | m_state = AE_TOP_CONFIGURED_SUSPEND; | |||
m_extDeferData = true; | m_extDeferData = true; | |||
} | } | |||
msg->Reply(CActiveAEControlProtocol::ACC); | msg->Reply(CActiveAEControlProtocol::ACC); | |||
skipping to change at line 831 | skipping to change at line 832 | |||
} | } | |||
break; | break; | |||
case AE_TOP_CONFIGURED_SUSPEND: | case AE_TOP_CONFIGURED_SUSPEND: | |||
if (port == &m_controlPort) | if (port == &m_controlPort) | |||
{ | { | |||
bool displayReset = false; | bool displayReset = false; | |||
switch (signal) | switch (signal) | |||
{ | { | |||
case CActiveAEControlProtocol::DISPLAYRESET: | case CActiveAEControlProtocol::DISPLAYRESET: | |||
if (m_extSuspended) | ||||
return; | ||||
CLog::Log(LOGDEBUG,"CActiveAE - display reset event"); | CLog::Log(LOGDEBUG,"CActiveAE - display reset event"); | |||
displayReset = true; | displayReset = true; | |||
case CActiveAEControlProtocol::INIT: | case CActiveAEControlProtocol::INIT: | |||
m_extError = false; | m_extError = false; | |||
m_extSuspended = false; | ||||
if (!displayReset) | if (!displayReset) | |||
{ | { | |||
m_controlPort.PurgeOut(CActiveAEControlProtocol::DEVICECHANGE); | m_controlPort.PurgeOut(CActiveAEControlProtocol::DEVICECHANGE); | |||
m_sink.EnumerateSinkList(true); | m_sink.EnumerateSinkList(true); | |||
LoadSettings(); | LoadSettings(); | |||
} | } | |||
Configure(); | Configure(); | |||
if (!displayReset) | if (!displayReset) | |||
msg->Reply(CActiveAEControlProtocol::ACC); | msg->Reply(CActiveAEControlProtocol::ACC); | |||
if (!m_extError) | if (!m_extError) | |||
End of changes. 3 change blocks. | ||||
0 lines changed or deleted | 4 lines changed or added |