m_bActiveSource(false),
m_iLastCommandSent(0),
m_iLastActive(0),
- m_cecVersion(CEC_VERSION_UNKNOWN)
+ m_cecVersion(CEC_VERSION_UNKNOWN),
+ m_deviceStatus(CEC_DEVICE_STATUS_UNKNOWN)
{
m_handler = new CCECCommandHandler(this);
CLockObject lock(&m_transmitMutex);
m_iLastActive = GetTimeMs();
m_handler->HandleCommand(command);
+ if (m_deviceStatus != CEC_DEVICE_STATUS_HANDLED_BY_LIBCEC)
+ m_deviceStatus = CEC_DEVICE_STATUS_PRESENT;
m_condition.Signal();
return true;
}
bool CCECBusDevice::PowerOn(void)
{
- cec_power_status current = GetPowerStatus();
- if (current != CEC_POWER_STATUS_ON &&
- current != CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON)
- {
- CStdString strLog;
- strLog.Format("<< powering on '%s' (%X)", GetLogicalAddressName(), m_iLogicalAddress);
- AddLog(CEC_LOG_DEBUG, strLog.c_str());
-
- SetPowerStatus(CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON);
-
- cec_command command;
- cec_command::Format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_IMAGE_VIEW_ON);
+ CStdString strLog;
+ strLog.Format("<< powering on '%s' (%X)", GetLogicalAddressName(), m_iLogicalAddress);
+ AddLog(CEC_LOG_DEBUG, strLog.c_str());
- return m_processor->Transmit(command);
+ cec_command command;
+ cec_command::Format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_IMAGE_VIEW_ON);
+ if (m_processor->Transmit(command))
+ {
+ GetPowerStatus();
+ return true;
}
- return true;
+ return false;
}
bool CCECBusDevice::Standby(void)
//@{
cec_version CCECBusDevice::GetCecVersion(void)
{
+ CLockObject lock(&m_mutex);
+ if (m_cecVersion == CEC_VERSION_UNKNOWN)
+ {
+ lock.Leave();
+ RequestCecVersion();
+ lock.Lock();
+ }
+
+ return m_cecVersion;
+}
+
+bool CCECBusDevice::RequestCecVersion(void)
+{
+ bool bReturn(false);
if (!MyLogicalAddressContains(m_iLogicalAddress))
{
CStdString strLog;
cec_command::Format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GET_CEC_VERSION);
CLockObject lock(&m_transmitMutex);
if (m_processor->Transmit(command))
- m_condition.Wait(&m_transmitMutex, 1000);
+ bReturn = m_condition.Wait(&m_transmitMutex, 1000);
}
-
- CLockObject lock(&m_mutex);
- return m_cecVersion;
+ return bReturn;
}
const char* CCECBusDevice::GetLogicalAddressName(void) const
cec_menu_language &CCECBusDevice::GetMenuLanguage(void)
{
+ CLockObject lock(&m_mutex);
+ if (!strcmp(m_menuLanguage.language, "???"))
+ {
+ lock.Leave();
+ RequestMenuLanguage();
+ lock.Lock();
+ }
+ return m_menuLanguage;
+}
+
+bool CCECBusDevice::RequestMenuLanguage(void)
+{
+ bool bReturn(false);
if (!MyLogicalAddressContains(m_iLogicalAddress))
{
CStdString strLog;
cec_command::Format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GET_MENU_LANGUAGE);
CLockObject lock(&m_transmitMutex);
if (m_processor->Transmit(command))
- m_condition.Wait(&m_transmitMutex, 1000);
+ bReturn = m_condition.Wait(&m_transmitMutex, 1000);
}
-
- CLockObject lock(&m_mutex);
- return m_menuLanguage;
+ return bReturn;
}
cec_logical_address CCECBusDevice::GetMyLogicalAddress(void) const
return m_processor->GetPhysicalAddress();
}
+uint16_t CCECBusDevice::GetPhysicalAddress(bool bRefresh /* = true */)
+{
+ if (GetStatus() == CEC_DEVICE_STATUS_PRESENT)
+ {
+ CLockObject lock(&m_mutex);
+ if (m_iPhysicalAddress == 0xFFFF || bRefresh)
+ {
+ lock.Leave();
+ RequestPhysicalAddress();
+ lock.Lock();
+ }
+ }
+
+ CLockObject lock(&m_mutex);
+ return m_iPhysicalAddress;
+}
+
+bool CCECBusDevice::RequestPhysicalAddress(void)
+{
+ bool bReturn(false);
+ if (!MyLogicalAddressContains(m_iLogicalAddress))
+ {
+ CStdString strLog;
+ strLog.Format("<< requesting physical address of '%s' (%X)", GetLogicalAddressName(), m_iLogicalAddress);
+ AddLog(CEC_LOG_NOTICE, strLog);
+ cec_command command;
+ cec_command::Format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GIVE_PHYSICAL_ADDRESS);
+ CLockObject lock(&m_transmitMutex);
+ if (m_processor->Transmit(command))
+ bReturn = m_condition.Wait(&m_transmitMutex, 1000);
+ }
+ return bReturn;
+}
+
cec_power_status CCECBusDevice::GetPowerStatus(void)
{
+ CLockObject lock(&m_mutex);
+ if (m_powerStatus == CEC_POWER_STATUS_UNKNOWN)
+ {
+ lock.Leave();
+ RequestPowerStatus();
+ lock.Lock();
+ }
+ return m_powerStatus;
+}
+
+bool CCECBusDevice::RequestPowerStatus(void)
+{
+ bool bReturn(false);
if (!MyLogicalAddressContains(m_iLogicalAddress))
{
CStdString strLog;
cec_command::Format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GIVE_DEVICE_POWER_STATUS);
CLockObject lock(&m_transmitMutex);
if (m_processor->Transmit(command))
- m_condition.Wait(&m_transmitMutex, 1000);
+ bReturn = m_condition.Wait(&m_transmitMutex, 1000);
}
+ return bReturn;
+}
+cec_vendor_id CCECBusDevice::GetVendorId(void)
+{
CLockObject lock(&m_mutex);
- return m_powerStatus;
+ if (m_vendor == CEC_VENDOR_UNKNOWN)
+ {
+ lock.Leave();
+ RequestVendorId();
+ lock.Lock();
+ }
+ return m_vendor;
}
-cec_vendor_id CCECBusDevice::GetVendorId(void)
+bool CCECBusDevice::RequestVendorId(void)
{
+ bool bReturn(false);
if (!MyLogicalAddressContains(m_iLogicalAddress))
{
CStdString strLog;
AddLog(CEC_LOG_NOTICE, strLog);
cec_command command;
cec_command::Format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
- CLockObject lock(&m_transmitMutex);
+ CLockObject lock(&m_transmitMutex);
if (m_processor->Transmit(command))
- m_condition.Wait(&m_transmitMutex, 1000);
+ bReturn = m_condition.Wait(&m_transmitMutex, 1000);
}
-
- CLockObject lock(&m_mutex);
- return m_vendor;
+ return bReturn;
}
const char *CCECBusDevice::GetVendorName(void)
{
- CLockObject lock(&m_mutex);
- return ToString(m_vendor);
+ return ToString(GetVendorId());
}
bool CCECBusDevice::MyLogicalAddressContains(cec_logical_address address) const
return m_processor->HasLogicalAddress(address);
}
+cec_bus_device_status CCECBusDevice::GetStatus(void)
+{
+ CLockObject lock(&m_mutex);
+ if (m_deviceStatus == CEC_DEVICE_STATUS_UNKNOWN)
+ {
+ if (m_processor->PollDevice(m_iLogicalAddress))
+ m_deviceStatus = CEC_DEVICE_STATUS_PRESENT;
+ else
+ m_deviceStatus = CEC_DEVICE_STATUS_NOT_PRESENT;
+ }
+
+ return m_deviceStatus;
+}
+
//@}
/** @name Setters */
m_powerStatus = CEC_POWER_STATUS_ON;
}
+bool CCECBusDevice::TryLogicalAddress(void)
+{
+ CStdString strLog;
+ strLog.Format("trying logical address '%s'", GetLogicalAddressName());
+ AddLog(CEC_LOG_DEBUG, strLog);
+
+ m_processor->SetAckMask(0x1 << m_iLogicalAddress);
+ if (!TransmitPoll(m_iLogicalAddress))
+ {
+ strLog.Format("using logical address '%s'", GetLogicalAddressName());
+ AddLog(CEC_LOG_NOTICE, strLog);
+ SetDeviceStatus(CEC_DEVICE_STATUS_HANDLED_BY_LIBCEC);
+
+ return true;
+ }
+
+ strLog.Format("logical address '%s' already taken", GetLogicalAddressName());
+ AddLog(CEC_LOG_DEBUG, strLog);
+ SetDeviceStatus(CEC_DEVICE_STATUS_PRESENT);
+ return false;
+}
+
+void CCECBusDevice::SetDeviceStatus(const cec_bus_device_status newStatus)
+{
+ CLockObject lock(&m_mutex);
+ switch (newStatus)
+ {
+ case CEC_DEVICE_STATUS_UNKNOWN:
+ m_iStreamPath = 0;
+ m_powerStatus = CEC_POWER_STATUS_UNKNOWN;
+ 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;
+ break;
+ case CEC_DEVICE_STATUS_HANDLED_BY_LIBCEC:
+ m_iStreamPath = 0;
+ m_powerStatus = CEC_POWER_STATUS_ON;
+ 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;
+ break;
+ case CEC_DEVICE_STATUS_PRESENT:
+ case CEC_DEVICE_STATUS_NOT_PRESENT:
+ m_deviceStatus = newStatus;
+ break;
+ }
+}
+
void CCECBusDevice::SetPhysicalAddress(uint16_t iNewAddress)
{
CLockObject lock(&m_mutex);
- if (iNewAddress > 0)
+ if (iNewAddress > 0 && m_iPhysicalAddress != iNewAddress)
{
CStdString strLog;
strLog.Format(">> %s (%X): physical address changed from %04x to %04x", GetLogicalAddressName(), m_iLogicalAddress, m_iPhysicalAddress, iNewAddress);
if (iNewAddress > 0)
{
CStdString strLog;
- strLog.Format(">> %s (%X): stream path changed from %04x to %04x", GetLogicalAddressName(), m_iLogicalAddress, iOldAddress, iNewAddress);
+ strLog.Format(">> %s (%X): stream path changed from %04x to %04x", GetLogicalAddressName(), m_iLogicalAddress, iOldAddress == 0 ? m_iStreamPath : iOldAddress, iNewAddress);
AddLog(CEC_LOG_DEBUG, strLog.c_str());
m_iStreamPath = iNewAddress;
cec_command command;
cec_command::Format(command, m_iLogicalAddress, dest, CEC_OPCODE_NONE);
- CLockObject lock(&m_transmitMutex);
- bReturn = m_processor->Transmit(command);
+ {
+ CLockObject lock(&m_transmitMutex);
+ bReturn = m_processor->Transmit(command);
+ }
+
AddLog(CEC_LOG_DEBUG, bReturn ? ">> POLL sent" : ">> POLL not sent");
+
+ if (bReturn)
+ {
+ CLockObject lock(&m_mutex);
+ m_iLastActive = GetTimeMs();
+ }
+
return bReturn;
}
return m_processor->Transmit(command);
}
}
+
+bool CCECBusDevice::SendKeypress(cec_user_control_code key, bool bWait /* = false */)
+{
+ {
+ CLockObject lock(&m_transmitMutex);
+ cec_command command;
+ cec_command::Format(command, m_processor->GetLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_USER_CONTROL_PRESSED);
+ command.parameters.PushBack(key);
+
+ if (bWait)
+ {
+ if (m_processor->Transmit(command))
+ return m_condition.Wait(&m_transmitMutex, 1000);
+ return false;
+ }
+
+ return m_processor->Transmit(command);
+ }
+}
+
+bool CCECBusDevice::SendKeyRelease(bool bWait /* = false */)
+{
+ {
+ CLockObject lock(&m_transmitMutex);
+ cec_command command;
+ cec_command::Format(command, m_processor->GetLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_USER_CONTROL_RELEASE);
+
+ if (bWait)
+ {
+ if (m_processor->Transmit(command))
+ return m_condition.Wait(&m_transmitMutex, 1000);
+ return false;
+ }
+ else
+ {
+ return m_processor->Transmit(command);
+ }
+ }
+}
//@}
repositories / deb_libcec.git / blobdiff