repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cosmetics
[deb_libcec.git]
/
src
/
lib
/
devices
/
CECBusDevice.cpp
diff --git
a/src/lib/devices/CECBusDevice.cpp
b/src/lib/devices/CECBusDevice.cpp
index f03f0cba0bbf590fd6d2baa325a5b6d56a595df2..794829ae3ab51ec84e23ed83275ebbde0f5116bd 100644
(file)
--- a/
src/lib/devices/CECBusDevice.cpp
+++ b/
src/lib/devices/CECBusDevice.cpp
@@
-434,10
+434,15
@@
void CCECBusDevice::SetMenuState(const cec_menu_state state)
}
}
}
}
-void CCECBusDevice::SetInactive
Devi
ce(void)
+void CCECBusDevice::SetInactive
Sour
ce(void)
{
{
- CLockObject lock(&m_writeMutex);
- m_bActiveSource = false;
+ {
+ CLockObject lock(&m_writeMutex);
+ m_bActiveSource = false;
+ }
+
+ if (MyLogicalAddressContains(m_iLogicalAddress))
+ SetPowerStatus(CEC_POWER_STATUS_STANDBY);
}
void CCECBusDevice::SetActiveSource(void)
}
void CCECBusDevice::SetActiveSource(void)
@@
-446,7
+451,7
@@
void CCECBusDevice::SetActiveSource(void)
for (int iPtr = 0; iPtr < 16; iPtr++)
if (iPtr != m_iLogicalAddress)
for (int iPtr = 0; iPtr < 16; iPtr++)
if (iPtr != m_iLogicalAddress)
- m_processor->m_busDevices[iPtr]->SetInactive
Devi
ce();
+ m_processor->m_busDevices[iPtr]->SetInactive
Sour
ce();
m_bActiveSource = true;
m_powerStatus = CEC_POWER_STATUS_ON;
m_bActiveSource = true;
m_powerStatus = CEC_POWER_STATUS_ON;
@@
-583,7
+588,7
@@
bool CCECBusDevice::SetVendorId(uint64_t iVendorId, bool bInitHandler /* = true
}
}
}
}
- if (bVendorChanged && bInitHandler)
+ if (bVendorChanged && bInitHandler
&& m_handler->GetVendorId() != CEC_VENDOR_UNKNOWN
)
m_handler->InitHandler();
CStdString strLog;
m_handler->InitHandler();
CStdString strLog;
@@
-783,13
+788,13
@@
bool CCECBusDevice::TransmitVendorID(cec_logical_address dest, bool bSendAbort /
}
}
}
}
-bool CCECBusDevice::TransmitKeypress(cec_user_control_code key)
+bool CCECBusDevice::TransmitKeypress(cec_user_control_code key
, bool bWait /* = true */
)
{
{
- return m_handler->TransmitKeypress(m_processor->GetLogicalAddress(), m_iLogicalAddress, key);
+ return m_handler->TransmitKeypress(m_processor->GetLogicalAddress(), m_iLogicalAddress, key
, bWait
);
}
}
-bool CCECBusDevice::TransmitKeyRelease(
void
)
+bool CCECBusDevice::TransmitKeyRelease(
bool bWait /* = true */
)
{
{
- return m_handler->TransmitKeyRelease(m_processor->GetLogicalAddress(), m_iLogicalAddress);
+ return m_handler->TransmitKeyRelease(m_processor->GetLogicalAddress(), m_iLogicalAddress
, bWait
);
}
//@}
}
//@}