m_vendor(CEC_VENDOR_UNKNOWN),
m_menuState(CEC_MENU_STATE_ACTIVATED),
m_bActiveSource(false),
- m_iLastCommandSent(0),
m_iLastActive(0),
m_cecVersion(CEC_VERSION_UNKNOWN),
m_deviceStatus(CEC_DEVICE_STATUS_UNKNOWN)
bool CCECBusDevice::HandleCommand(const cec_command &command)
{
+ bool bHandled(false);
+
+ /* update "last active" */
{
CLockObject lock(&m_writeMutex);
m_iLastActive = GetTimeMs();
}
- m_handler->HandleCommand(command);
+ /* handle the command */
+ bHandled = m_handler->HandleCommand(command);
+ /* change status to present */
+ if (bHandled)
{
CLockObject lock(&m_writeMutex);
if (m_deviceStatus != CEC_DEVICE_STATUS_HANDLED_BY_LIBCEC)
m_deviceStatus = CEC_DEVICE_STATUS_PRESENT;
}
}
- return true;
+
+ return bHandled;
}
bool CCECBusDevice::PowerOn(void)
{
{
CLockObject lock(&m_mutex);
- m_powerStatus = CEC_POWER_STATUS_UNKNOWN;
- }
- cec_power_status status = GetPowerStatus();
- if (status == CEC_POWER_STATUS_STANDBY || status == CEC_POWER_STATUS_UNKNOWN)
- {
- SendKeypress(CEC_USER_CONTROL_CODE_POWER);
- return SendKeyRelease();
+// m_powerStatus = CEC_POWER_STATUS_UNKNOWN;
+ m_powerStatus = CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON;
}
+// cec_power_status status = GetPowerStatus();
+// if (status == CEC_POWER_STATUS_STANDBY || status == CEC_POWER_STATUS_UNKNOWN)
+// {
+// /* sending the normal power on command appears to have failed */
+// CStdString strLog;
+// strLog.Format("<< sending power on keypress to '%s' (%X)", GetLogicalAddressName(), m_iLogicalAddress);
+// AddLog(CEC_LOG_DEBUG, strLog.c_str());
+//
+// TransmitKeypress(CEC_USER_CONTROL_CODE_POWER);
+// return TransmitKeyRelease();
+// }
return true;
}
/** @name Getters */
//@{
-cec_version CCECBusDevice::GetCecVersion(void)
+cec_version CCECBusDevice::GetCecVersion(bool bUpdate /* = false */)
{
CLockObject lock(&m_mutex);
if (GetStatus() == CEC_DEVICE_STATUS_PRESENT &&
- m_cecVersion == CEC_VERSION_UNKNOWN)
+ (bUpdate || m_cecVersion == CEC_VERSION_UNKNOWN))
RequestCecVersion();
return m_cecVersion;
return bReturn;
}
-uint64_t CCECBusDevice::GetLastCommandSent(void) const
-{
- return GetTimeMs() - m_iLastCommandSent;
-}
-
const char* CCECBusDevice::GetLogicalAddressName(void) const
{
return ToString(m_iLogicalAddress);
}
-cec_menu_language &CCECBusDevice::GetMenuLanguage(void)
+cec_menu_language &CCECBusDevice::GetMenuLanguage(bool bUpdate /* = false */)
{
CLockObject lock(&m_mutex);
if (GetStatus() == CEC_DEVICE_STATUS_PRESENT &&
- !strcmp(m_menuLanguage.language, "???"))
+ (bUpdate || !strcmp(m_menuLanguage.language, "???")))
RequestMenuLanguage();
return m_menuLanguage;
return m_processor->GetPhysicalAddress();
}
-CStdString CCECBusDevice::GetOSDName(void)
+CStdString CCECBusDevice::GetOSDName(bool bUpdate /* = false */)
{
CLockObject lock(&m_mutex);
if (GetStatus() == CEC_DEVICE_STATUS_PRESENT &&
- m_strDeviceName.Equals(ToString(m_iLogicalAddress)) &&
+ (bUpdate || m_strDeviceName.Equals(ToString(m_iLogicalAddress))) &&
m_type != CEC_DEVICE_TYPE_TV)
RequestOSDName();
return bReturn;
}
-uint16_t CCECBusDevice::GetPhysicalAddress(bool bRefresh /* = true */)
+uint16_t CCECBusDevice::GetPhysicalAddress(bool bUpdate /* = false */)
{
CLockObject lock(&m_mutex);
if (GetStatus() == CEC_DEVICE_STATUS_PRESENT &&
- (m_iPhysicalAddress == 0xFFFF || bRefresh))
+ (m_iPhysicalAddress == 0xFFFF || bUpdate))
{
if (!RequestPhysicalAddress())
AddLog(CEC_LOG_ERROR, "failed to request the physical address");
return bReturn;
}
-cec_power_status CCECBusDevice::GetPowerStatus(void)
+cec_power_status CCECBusDevice::GetPowerStatus(bool bUpdate /* = false */)
{
CLockObject lock(&m_mutex);
if (GetStatus() == CEC_DEVICE_STATUS_PRESENT &&
- m_powerStatus == CEC_POWER_STATUS_UNKNOWN)
+ (bUpdate || m_powerStatus == CEC_POWER_STATUS_UNKNOWN))
RequestPowerStatus();
return m_powerStatus;
return bReturn;
}
-cec_vendor_id CCECBusDevice::GetVendorId(void)
+cec_vendor_id CCECBusDevice::GetVendorId(bool bUpdate /* = false */)
{
CLockObject lock(&m_mutex);
if (GetStatus() == CEC_DEVICE_STATUS_PRESENT &&
- m_vendor == CEC_VENDOR_UNKNOWN)
+ (bUpdate || m_vendor == CEC_VENDOR_UNKNOWN))
RequestVendorId();
return m_vendor;
return bReturn;
}
-const char *CCECBusDevice::GetVendorName(void)
+const char *CCECBusDevice::GetVendorName(bool bUpdate /* = false */)
{
- return ToString(GetVendorId());
+ return ToString(GetVendorId(bUpdate));
}
bool CCECBusDevice::MyLogicalAddressContains(cec_logical_address address) const
cec_bus_device_status CCECBusDevice::GetStatus(bool bForcePoll /* = false */)
{
CLockObject lock(&m_writeMutex);
- if (m_deviceStatus == CEC_DEVICE_STATUS_UNKNOWN || bForcePoll)
+ if (m_deviceStatus != CEC_DEVICE_STATUS_HANDLED_BY_LIBCEC &&
+ (m_deviceStatus == CEC_DEVICE_STATUS_UNKNOWN || bForcePoll))
{
lock.Leave();
bool bPollAcked(false);
m_vendor = CEC_VENDOR_UNKNOWN;
m_menuState = CEC_MENU_STATE_ACTIVATED;
m_bActiveSource = false;
- m_iLastCommandSent = 0;
m_iLastActive = 0;
m_cecVersion = CEC_VERSION_UNKNOWN;
m_deviceStatus = newStatus;
m_vendor = CEC_VENDOR_UNKNOWN;
m_menuState = CEC_MENU_STATE_ACTIVATED;
m_bActiveSource = false;
- m_iLastCommandSent = 0;
m_iLastActive = 0;
m_cecVersion = CEC_VERSION_1_3A;
m_deviceStatus = newStatus;
if (dest == CECDEVICE_UNKNOWN)
dest = m_iLogicalAddress;
+ CCECBusDevice *destDevice = m_processor->m_busDevices[dest];
+ if (destDevice->m_deviceStatus == CEC_DEVICE_STATUS_HANDLED_BY_LIBCEC)
+ return bReturn;
+
CStdString strLog;
strLog.Format("<< %s (%X) -> %s (%X): POLL", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest);
AddLog(CEC_LOG_NOTICE, strLog.c_str());
bReturn = m_handler->TransmitPoll(m_iLogicalAddress, dest);
AddLog(CEC_LOG_DEBUG, bReturn ? ">> POLL sent" : ">> POLL not sent");
+ CLockObject lock(&m_writeMutex);
if (bReturn)
{
- CLockObject lock(&m_writeMutex);
m_iLastActive = GetTimeMs();
+ destDevice->m_deviceStatus = CEC_DEVICE_STATUS_PRESENT;
}
+ else
+ destDevice->m_deviceStatus = CEC_DEVICE_STATUS_NOT_PRESENT;
return bReturn;
}
return m_handler->TransmitPowerState(m_iLogicalAddress, dest, state);
}
-bool CCECBusDevice::TransmitVendorID(cec_logical_address dest)
+bool CCECBusDevice::TransmitVendorID(cec_logical_address dest, bool bSendAbort /* = true */)
{
uint64_t iVendorId;
{
if (iVendorId == CEC_VENDOR_UNKNOWN)
{
- CStdString strLog;
- strLog.Format("<< %s (%X) -> %s (%X): vendor id feature abort", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest);
- AddLog(CEC_LOG_NOTICE, strLog);
+ if (bSendAbort)
+ {
+ CStdString strLog;
+ strLog.Format("<< %s (%X) -> %s (%X): vendor id feature abort", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest);
+ AddLog(CEC_LOG_NOTICE, strLog);
- m_processor->TransmitAbort(dest, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
+ m_processor->TransmitAbort(dest, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
+ }
return false;
}
else
}
}
-bool CCECBusDevice::SendKeypress(cec_user_control_code key)
+bool CCECBusDevice::TransmitKeypress(cec_user_control_code key)
{
- return m_handler->SendKeypress(m_processor->GetLogicalAddress(), m_iLogicalAddress, key);
+ return m_handler->TransmitKeypress(m_processor->GetLogicalAddress(), m_iLogicalAddress, key);
}
-bool CCECBusDevice::SendKeyRelease(void)
+bool CCECBusDevice::TransmitKeyRelease(void)
{
- return m_handler->SendKeyRelease(m_processor->GetLogicalAddress(), m_iLogicalAddress);
+ return m_handler->TransmitKeyRelease(m_processor->GetLogicalAddress(), m_iLogicalAddress);
}
//@}