X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fdevices%2FCECBusDevice.cpp;h=7fe92a451236ec893e89ef47fd213e5ae164fb56;hb=9bc8934c6dac8efcd2f636b6f68798049f84deac;hp=0fb3bf3a487bd50a013e6df7ed105d859b29b921;hpb=8747dd4fbf6aca45c49391ba754f013f28ca3806;p=deb_libcec.git

diff --git a/src/lib/devices/CECBusDevice.cpp b/src/lib/devices/CECBusDevice.cpp
index 0fb3bf3..7fe92a4 100644
--- a/src/lib/devices/CECBusDevice.cpp
+++ b/src/lib/devices/CECBusDevice.cpp
@@ -40,17 +40,22 @@
 
 using namespace CEC;
 
+#define ToString(p) m_processor->ToString(p)
+
 CCECBusDevice::CCECBusDevice(CCECProcessor *processor, cec_logical_address iLogicalAddress, uint16_t iPhysicalAddress) :
+  m_type(CEC_DEVICE_TYPE_RESERVED),
   m_iPhysicalAddress(iPhysicalAddress),
   m_iStreamPath(0),
   m_iLogicalAddress(iLogicalAddress),
   m_powerStatus(CEC_POWER_STATUS_UNKNOWN),
   m_processor(processor),
-  m_bMenuActive(true),
+  m_vendor(CEC_VENDOR_UNKNOWN),
+  m_menuState(CEC_MENU_STATE_ACTIVATED),
   m_bActiveSource(false),
-  m_iVendorClass(CEC_VENDOR_UNKNOWN),
+  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);
 
@@ -59,9 +64,7 @@ CCECBusDevice::CCECBusDevice(CCECProcessor *processor, cec_logical_address iLogi
   m_menuLanguage.language[3] = 0;
   m_menuLanguage.device = iLogicalAddress;
 
-  m_vendor.vendor = CEC_VENDOR_UNKNOWN;
-  m_type          = CEC_DEVICE_TYPE_RESERVED;
-  m_strDeviceName = "Unknown";
+  m_strDeviceName = ToString(m_iLogicalAddress);
 }
 
 CCECBusDevice::~CCECBusDevice(void)
@@ -77,53 +80,49 @@ void CCECBusDevice::AddLog(cec_log_level level, const CStdString &strMessage)
 
 bool CCECBusDevice::HandleCommand(const cec_command &command)
 {
-  CLockObject lock(&m_mutex);
+  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;
 }
 
-void CCECBusDevice::PollVendorId(void)
-{
-  CLockObject lock(&m_mutex);
-  if (m_iLastActive > 0 && m_iLogicalAddress != CECDEVICE_BROADCAST &&
-      m_vendor.vendor == CEC_VENDOR_UNKNOWN &&
-      GetTimeMs() - m_iLastActive > 5000 &&
-      !m_processor->IsMonitoring())
-  {
-    CStdString strLog;
-    strLog.Format("<< requesting vendor ID of device %x", m_iLogicalAddress);
-    AddLog(CEC_LOG_NOTICE, strLog);
-    m_iLastActive = GetTimeMs();
-
-    cec_command command;
-    cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
-    if (m_processor->Transmit(command))
-      m_condition.Wait(&m_mutex, 1000);
-  }
-}
-
 bool CCECBusDevice::PowerOn(void)
 {
   CStdString strLog;
-  strLog.Format("<< powering on device with logical address %d", (int8_t)m_iLogicalAddress);
+  strLog.Format("<< powering on '%s' (%X)", GetLogicalAddressName(), m_iLogicalAddress);
   AddLog(CEC_LOG_DEBUG, strLog.c_str());
 
   cec_command command;
-  cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_IMAGE_VIEW_ON);
+  cec_command::Format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_IMAGE_VIEW_ON);
+  if (m_processor->Transmit(command))
+  {
+    {
+      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, true);
+      return SendKeyRelease(false);
+    }
+    return true;
+  }
 
-  return m_processor->Transmit(command);
+  return false;
 }
 
 bool CCECBusDevice::Standby(void)
 {
   CStdString strLog;
-  strLog.Format("<< putting device with logical address %d in standby mode", (int8_t)m_iLogicalAddress);
+  strLog.Format("<< putting '%s' (%X) in standby mode", GetLogicalAddressName(), m_iLogicalAddress);
   AddLog(CEC_LOG_DEBUG, strLog.c_str());
 
   cec_command command;
-  cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_STANDBY);
+  cec_command::Format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_STANDBY);
 
   return m_processor->Transmit(command);
 }
@@ -132,44 +131,68 @@ bool CCECBusDevice::Standby(void)
 //@{
 cec_version CCECBusDevice::GetCecVersion(void)
 {
-  if (m_cecVersion == CEC_VERSION_UNKNOWN)
-  {
-    if (!MyLogicalAddressContains(m_iLogicalAddress))
-    {
-      CStdString strLog;
-      strLog.Format("<< requesting CEC version of device %x", m_iLogicalAddress);
-      AddLog(CEC_LOG_NOTICE, strLog);
-      cec_command command;
-      cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GET_CEC_VERSION);
-      CLockObject lock(&m_mutex);
-      if (m_processor->Transmit(command))
-        m_condition.Wait(&m_mutex, 1000);
-    }
-  }
+  CLockObject lock(&m_mutex);
+  if (GetStatus() == CEC_DEVICE_STATUS_PRESENT &&
+      m_cecVersion == CEC_VERSION_UNKNOWN)
+    RequestCecVersion();
 
   return m_cecVersion;
 }
 
-cec_menu_language &CCECBusDevice::GetMenuLanguage(void)
+bool CCECBusDevice::RequestCecVersion(void)
 {
-  if (!strcmp(m_menuLanguage.language, "???"))
+  bool bReturn(false);
+  if (!MyLogicalAddressContains(m_iLogicalAddress))
   {
-    if (!MyLogicalAddressContains(m_iLogicalAddress))
-    {
-      CStdString strLog;
-      strLog.Format("<< requesting menu language of device %x", m_iLogicalAddress);
-      AddLog(CEC_LOG_NOTICE, strLog);
-      cec_command command;
-      cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GET_MENU_LANGUAGE);
-      CLockObject lock(&m_mutex);
-      if (m_processor->Transmit(command))
-        m_condition.Wait(&m_mutex, 1000);
-    }
+    CStdString strLog;
+    strLog.Format("<< requesting CEC version of '%s' (%X)", GetLogicalAddressName(), m_iLogicalAddress);
+    AddLog(CEC_LOG_NOTICE, strLog);
+    cec_command command;
+    cec_command::Format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GET_CEC_VERSION);
+    CLockObject lock(&m_transmitMutex);
+    if (m_processor->Transmit(command))
+      bReturn = m_condition.Wait(&m_transmitMutex, 1000);
   }
+  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)
+{
+  CLockObject lock(&m_mutex);
+  if (GetStatus() == CEC_DEVICE_STATUS_PRESENT &&
+      !strcmp(m_menuLanguage.language, "???"))
+    RequestMenuLanguage();
 
   return m_menuLanguage;
 }
 
+bool CCECBusDevice::RequestMenuLanguage(void)
+{
+  bool bReturn(false);
+  if (!MyLogicalAddressContains(m_iLogicalAddress))
+  {
+    CStdString strLog;
+    strLog.Format("<< requesting menu language of '%s' (%X)", GetLogicalAddressName(), m_iLogicalAddress);
+    AddLog(CEC_LOG_NOTICE, strLog);
+    cec_command command;
+    cec_command::Format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GET_MENU_LANGUAGE);
+    CLockObject lock(&m_transmitMutex);
+    if (m_processor->Transmit(command))
+      bReturn = m_condition.Wait(&m_transmitMutex, 1000);
+  }
+  return bReturn;
+}
+
 cec_logical_address CCECBusDevice::GetMyLogicalAddress(void) const
 {
   return m_processor->GetLogicalAddress();
@@ -180,100 +203,322 @@ uint16_t CCECBusDevice::GetMyPhysicalAddress(void) const
   return m_processor->GetPhysicalAddress();
 }
 
-cec_power_status CCECBusDevice::GetPowerStatus(void)
+CStdString CCECBusDevice::GetOSDName(void)
+{
+  CLockObject lock(&m_mutex);
+  if (GetStatus() == CEC_DEVICE_STATUS_PRESENT &&
+      m_strDeviceName.Equals(ToString(m_iLogicalAddress)))
+    RequestOSDName();
+
+  return m_strDeviceName;
+}
+
+bool CCECBusDevice::RequestOSDName(void)
 {
-  if (m_powerStatus == CEC_POWER_STATUS_UNKNOWN)
+  bool bReturn(false);
+  if (!MyLogicalAddressContains(m_iLogicalAddress))
   {
-    if (!MyLogicalAddressContains(m_iLogicalAddress))
-    {
-      CStdString strLog;
-      strLog.Format("<< requesting power status of device %x", m_iLogicalAddress);
-      AddLog(CEC_LOG_NOTICE, strLog);
-      cec_command command;
-      cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GIVE_DEVICE_POWER_STATUS);
-      CLockObject lock(&m_mutex);
-      if (m_processor->Transmit(command))
-        m_condition.Wait(&m_mutex, 1000);
-    }
+    CStdString strLog;
+    strLog.Format("<< requesting OSD name of '%s' (%X)", GetLogicalAddressName(), m_iLogicalAddress);
+    AddLog(CEC_LOG_NOTICE, strLog);
+    cec_command command;
+    cec_command::Format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GIVE_OSD_NAME);
+    CLockObject lock(&m_transmitMutex);
+    if (m_processor->Transmit(command))
+      bReturn = m_condition.Wait(&m_transmitMutex, 1000);
+  }
+  return bReturn;
+}
+
+uint16_t CCECBusDevice::GetPhysicalAddress(bool bRefresh /* = true */)
+{
+  CLockObject lock(&m_mutex);
+  if (GetStatus() == CEC_DEVICE_STATUS_PRESENT &&
+      (m_iPhysicalAddress == 0xFFFF || bRefresh))
+  {
+    if (!RequestPhysicalAddress())
+      AddLog(CEC_LOG_ERROR, "failed to request the physical address");
   }
 
-  return m_powerStatus;
+  return m_iPhysicalAddress;
 }
 
-const cec_vendor &CCECBusDevice::GetVendor(void)
+bool CCECBusDevice::RequestPhysicalAddress(void)
 {
-  if (m_vendor.vendor == CEC_VENDOR_UNKNOWN)
+  bool bReturn(false);
+  if (!MyLogicalAddressContains(m_iLogicalAddress))
   {
-    if (!MyLogicalAddressContains(m_iLogicalAddress))
-    {
-      CStdString strLog;
-      strLog.Format("<< requesting vendor ID of device %x", m_iLogicalAddress);
-      AddLog(CEC_LOG_NOTICE, strLog);
-      cec_command command;
-      cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
-      CLockObject lock(&m_mutex);
+    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;
+}
 
-      if (m_processor->Transmit(command))
-        m_condition.Wait(&m_mutex, 1000);
-    }
+cec_power_status CCECBusDevice::GetPowerStatus(void)
+{
+  CLockObject lock(&m_mutex);
+  if (GetStatus() == CEC_DEVICE_STATUS_PRESENT &&
+      m_powerStatus == CEC_POWER_STATUS_UNKNOWN)
+    RequestPowerStatus();
+
+  return m_powerStatus;
+}
+
+bool CCECBusDevice::RequestPowerStatus(void)
+{
+  bool bReturn(false);
+  if (!MyLogicalAddressContains(m_iLogicalAddress))
+  {
+    CStdString strLog;
+    strLog.Format("<< requesting power status of '%s' (%X)", GetLogicalAddressName(), m_iLogicalAddress);
+    AddLog(CEC_LOG_NOTICE, strLog);
+    cec_command command;
+    cec_command::Format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GIVE_DEVICE_POWER_STATUS);
+    CLockObject lock(&m_transmitMutex);
+    if (m_processor->Transmit(command))
+      bReturn = m_condition.Wait(&m_transmitMutex, 1000);
   }
+  return bReturn;
+}
+
+cec_vendor_id CCECBusDevice::GetVendorId(void)
+{
+  CLockObject lock(&m_mutex);
+  if (GetStatus() == CEC_DEVICE_STATUS_PRESENT &&
+      m_vendor == CEC_VENDOR_UNKNOWN)
+    RequestVendorId();
 
   return m_vendor;
 }
 
-bool CCECBusDevice::MyLogicalAddressContains(cec_logical_address address) const
+bool CCECBusDevice::RequestVendorId(void)
 {
-  return m_processor->HasLogicalAddress(address);
+  bool bReturn(false);
+  if (!MyLogicalAddressContains(m_iLogicalAddress))
+  {
+    CStdString strLog;
+    strLog.Format("<< requesting vendor ID of '%s' (%X)", GetLogicalAddressName(), m_iLogicalAddress);
+    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);
+    if (m_processor->Transmit(command))
+      bReturn = m_condition.Wait(&m_transmitMutex, 1000);
+  }
+  return bReturn;
 }
 
-//@}
+const char *CCECBusDevice::GetVendorName(void)
+{
+  return ToString(GetVendorId());
+}
 
-/** @name Setters */
-//@{
-void CCECBusDevice::SetCecVersion(const cec_version newVersion)
+bool CCECBusDevice::MyLogicalAddressContains(cec_logical_address address) const
 {
-  CStdString strLog;
-  m_cecVersion = newVersion;
+  return m_processor->HasLogicalAddress(address);
+}
 
-  switch (newVersion)
+bool CCECBusDevice::NeedsPoll(void)
+{
+  bool bSendPoll(false);
+  switch (m_iLogicalAddress)
   {
-  case CEC_VERSION_1_2:
-    strLog.Format("device %d: CEC version 1.2", m_iLogicalAddress);
+  case CECDEVICE_PLAYBACKDEVICE3:
+    if (m_processor->m_busDevices[CECDEVICE_PLAYBACKDEVICE2]->GetStatus() == CEC_DEVICE_STATUS_PRESENT)
+      bSendPoll = true;
+    break;
+  case CECDEVICE_PLAYBACKDEVICE2:
+    if (m_processor->m_busDevices[CECDEVICE_PLAYBACKDEVICE1]->GetStatus() == CEC_DEVICE_STATUS_PRESENT)
+      bSendPoll = true;
+    break;
+  case CECDEVICE_RECORDINGDEVICE3:
+    if (m_processor->m_busDevices[CECDEVICE_RECORDINGDEVICE2]->GetStatus() == CEC_DEVICE_STATUS_PRESENT)
+      bSendPoll = true;
     break;
-  case CEC_VERSION_1_2A:
-    strLog.Format("device %d: CEC version 1.2a", m_iLogicalAddress);
+  case CECDEVICE_RECORDINGDEVICE2:
+    if (m_processor->m_busDevices[CECDEVICE_RECORDINGDEVICE1]->GetStatus() == CEC_DEVICE_STATUS_PRESENT)
+      bSendPoll = true;
     break;
-  case CEC_VERSION_1_3:
-    strLog.Format("device %d: CEC version 1.3", m_iLogicalAddress);
+  case CECDEVICE_TUNER4:
+    if (m_processor->m_busDevices[CECDEVICE_TUNER3]->GetStatus() == CEC_DEVICE_STATUS_PRESENT)
+      bSendPoll = true;
     break;
-  case CEC_VERSION_1_3A:
-    strLog.Format("device %d: CEC version 1.3a", m_iLogicalAddress);
+  case CECDEVICE_TUNER3:
+    if (m_processor->m_busDevices[CECDEVICE_TUNER2]->GetStatus() == CEC_DEVICE_STATUS_PRESENT)
+      bSendPoll = true;
+    break;
+  case CECDEVICE_TUNER2:
+    if (m_processor->m_busDevices[CECDEVICE_TUNER1]->GetStatus() == CEC_DEVICE_STATUS_PRESENT)
+      bSendPoll = true;
+    break;
+  case CECDEVICE_AUDIOSYSTEM:
+  case CECDEVICE_PLAYBACKDEVICE1:
+  case CECDEVICE_RECORDINGDEVICE1:
+  case CECDEVICE_TUNER1:
+  case CECDEVICE_TV:
+    bSendPoll = true;
     break;
   default:
-    strLog.Format("device %d: unknown CEC version", m_iLogicalAddress);
-    m_cecVersion = CEC_VERSION_UNKNOWN;
     break;
   }
+
+  return bSendPoll;
+}
+
+cec_bus_device_status CCECBusDevice::GetStatus(bool bForcePoll /* = false */)
+{
+  CLockObject lock(&m_writeMutex);
+  if (m_deviceStatus == CEC_DEVICE_STATUS_UNKNOWN || bForcePoll)
+  {
+    lock.Leave();
+    bool bPollAcked(false);
+    if (bForcePoll || NeedsPoll())
+      bPollAcked = m_processor->PollDevice(m_iLogicalAddress);
+
+    lock.Lock();
+    m_deviceStatus = bPollAcked ? CEC_DEVICE_STATUS_PRESENT : CEC_DEVICE_STATUS_NOT_PRESENT;
+  }
+
+  return m_deviceStatus;
+}
+
+//@}
+
+/** @name Setters */
+//@{
+void CCECBusDevice::SetCecVersion(const cec_version newVersion)
+{
+  m_cecVersion = newVersion;
+
+  CStdString strLog;
+  strLog.Format("%s (%X): CEC version %s", GetLogicalAddressName(), m_iLogicalAddress, ToString(newVersion));
   AddLog(CEC_LOG_DEBUG, strLog);
 }
 
 void CCECBusDevice::SetMenuLanguage(const cec_menu_language &language)
 {
+  CLockObject lock(&m_writeMutex);
   if (language.device == m_iLogicalAddress)
   {
     CStdString strLog;
-    strLog.Format("device %d menu language set to '%s'", m_iLogicalAddress, language.language);
+    strLog.Format(">> %s (%X): menu language set to '%s'", GetLogicalAddressName(), m_iLogicalAddress, language.language);
     m_processor->AddLog(CEC_LOG_DEBUG, strLog);
     m_menuLanguage = language;
   }
 }
 
+void CCECBusDevice::SetOSDName(CStdString strName)
+{
+  CLockObject lock(&m_writeMutex);
+  if (m_strDeviceName != strName)
+  {
+    CStdString strLog;
+    strLog.Format(">> %s (%X): osd name set to '%s'", GetLogicalAddressName(), m_iLogicalAddress, strName);
+    m_processor->AddLog(CEC_LOG_DEBUG, strLog);
+    m_strDeviceName = strName;
+  }
+}
+
+void CCECBusDevice::SetMenuState(const cec_menu_state state)
+{
+  CLockObject lock(&m_writeMutex);
+  if (m_menuState != state)
+  {
+    CStdString strLog;
+    strLog.Format(">> %s (%X): menu state set to '%s'", GetLogicalAddressName(), m_iLogicalAddress, ToString(m_menuState));
+    m_processor->AddLog(CEC_LOG_DEBUG, strLog);
+    m_menuState = state;
+  }
+}
+
+void CCECBusDevice::SetInactiveDevice(void)
+{
+  CLockObject lock(&m_writeMutex);
+  m_bActiveSource = false;
+}
+
+void CCECBusDevice::SetActiveDevice(void)
+{
+  CLockObject lock(&m_writeMutex);
+
+  for (int iPtr = 0; iPtr < 16; iPtr++)
+    if (iPtr != m_iLogicalAddress)
+      m_processor->m_busDevices[iPtr]->SetInactiveDevice();
+
+  m_bActiveSource = true;
+  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_writeMutex);
+  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)
 {
-  if (iNewAddress > 0)
+  CLockObject lock(&m_writeMutex);
+  if (iNewAddress > 0 && m_iPhysicalAddress != iNewAddress)
   {
     CStdString strLog;
-    strLog.Format(">> %i changed physical address from %04x to %04x", m_iLogicalAddress, m_iPhysicalAddress, iNewAddress);
+    strLog.Format(">> %s (%X): physical address changed from %04x to %04x", GetLogicalAddressName(), m_iLogicalAddress, m_iPhysicalAddress, iNewAddress);
     AddLog(CEC_LOG_DEBUG, strLog.c_str());
 
     m_iPhysicalAddress = iNewAddress;
@@ -282,66 +527,76 @@ void CCECBusDevice::SetPhysicalAddress(uint16_t iNewAddress)
 
 void CCECBusDevice::SetStreamPath(uint16_t iNewAddress, uint16_t iOldAddress /* = 0 */)
 {
+  CLockObject lock(&m_writeMutex);
   if (iNewAddress > 0)
   {
     CStdString strLog;
-    strLog.Format(">> %i stream path from %04x to %04x", 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;
+
+    if (iNewAddress > 0)
+    {
+      lock.Leave();
+      SetPowerStatus(CEC_POWER_STATUS_ON);
+    }
   }
 }
 
 void CCECBusDevice::SetPowerStatus(const cec_power_status powerStatus)
 {
+  CLockObject lock(&m_writeMutex);
   if (m_powerStatus != powerStatus)
   {
     CStdString strLog;
-    strLog.Format("device %d power status changed from %2x to %2x", m_iLogicalAddress, m_powerStatus, powerStatus);
+    strLog.Format(">> %s (%X): power status changed from '%s' to '%s'", GetLogicalAddressName(), m_iLogicalAddress, ToString(m_powerStatus), ToString(powerStatus));
     m_processor->AddLog(CEC_LOG_DEBUG, strLog);
     m_powerStatus = powerStatus;
   }
 }
 
-void CCECBusDevice::SetVendorId(uint64_t iVendorId, uint8_t iVendorClass /* = 0 */)
+void CCECBusDevice::SetVendorId(uint64_t iVendorId)
 {
-  m_vendor.vendor = (cec_vendor_id)iVendorId;
-  m_iVendorClass = iVendorClass;
-
-  switch (iVendorId)
   {
-  case CEC_VENDOR_SAMSUNG:
-    if (m_handler->GetVendorId() != CEC_VENDOR_SAMSUNG)
-    {
-      delete m_handler;
-      m_handler = new CANCommandHandler(this);
-    }
-    break;
-  case CEC_VENDOR_LG:
-    if (m_handler->GetVendorId() != CEC_VENDOR_LG)
-    {
-      delete m_handler;
-      m_handler = new CSLCommandHandler(this);
-    }
-    break;
-  case CEC_VENDOR_PANASONIC:
-    if (m_handler->GetVendorId() != CEC_VENDOR_PANASONIC)
-    {
-      delete m_handler;
-      m_handler = new CVLCommandHandler(this);
-    }
-    break;
-  default:
-    if (m_handler->GetVendorId() != CEC_VENDOR_UNKNOWN)
+    CLockObject lock(&m_writeMutex);
+    m_vendor = (cec_vendor_id)iVendorId;
+
+    switch (iVendorId)
     {
-      delete m_handler;
-      m_handler = new CCECCommandHandler(this);
+    case CEC_VENDOR_SAMSUNG:
+      if (m_handler->GetVendorId() != CEC_VENDOR_SAMSUNG)
+      {
+        delete m_handler;
+        m_handler = new CANCommandHandler(this);
+      }
+      break;
+    case CEC_VENDOR_LG:
+      if (m_handler->GetVendorId() != CEC_VENDOR_LG)
+      {
+        delete m_handler;
+        m_handler = new CSLCommandHandler(this);
+      }
+      break;
+    case CEC_VENDOR_PANASONIC:
+      if (m_handler->GetVendorId() != CEC_VENDOR_PANASONIC)
+      {
+        delete m_handler;
+        m_handler = new CVLCommandHandler(this);
+      }
+      break;
+    default:
+      if (m_handler->GetVendorId() != CEC_VENDOR_UNKNOWN)
+      {
+        delete m_handler;
+        m_handler = new CCECCommandHandler(this);
+      }
+      break;
     }
-    break;
   }
 
   CStdString strLog;
-  strLog.Format("device %d: vendor = %s (%06x) class = %2x", m_iLogicalAddress, GetVendorName(), GetVendorId(), GetVendorClass());
+  strLog.Format("%s (%X): vendor = %s (%06x)", GetLogicalAddressName(), m_iLogicalAddress, ToString(m_vendor), m_vendor);
   m_processor->AddLog(CEC_LOG_DEBUG, strLog.c_str());
 }
 //@}
@@ -350,95 +605,62 @@ void CCECBusDevice::SetVendorId(uint64_t iVendorId, uint8_t iVendorClass /* = 0
 //@{
 bool CCECBusDevice::TransmitActiveSource(void)
 {
-  if (m_bActiveSource)
+  CLockObject lock(&m_writeMutex);
+  if (m_powerStatus != CEC_POWER_STATUS_ON)
   {
     CStdString strLog;
-    strLog.Format("<< %x -> broadcast: active source (%4x)", m_iLogicalAddress, m_iPhysicalAddress);
+    strLog.Format("<< %s (%X) is not powered on", GetLogicalAddressName(), m_iLogicalAddress);
+    AddLog(CEC_LOG_DEBUG, strLog);
+  }
+  else if (m_bActiveSource)
+  {
+    CStdString strLog;
+    strLog.Format("<< %s (%X) -> broadcast (F): active source (%4x)", GetLogicalAddressName(), m_iLogicalAddress, m_iPhysicalAddress);
     AddLog(CEC_LOG_NOTICE, strLog);
 
     cec_command command;
-    cec_command::format(command, m_iLogicalAddress, CECDEVICE_BROADCAST, CEC_OPCODE_ACTIVE_SOURCE);
-    command.parameters.push_back((uint8_t) ((m_iPhysicalAddress >> 8) & 0xFF));
-    command.parameters.push_back((uint8_t) (m_iPhysicalAddress & 0xFF));
+    cec_command::Format(command, m_iLogicalAddress, CECDEVICE_BROADCAST, CEC_OPCODE_ACTIVE_SOURCE);
+    command.parameters.PushBack((uint8_t) ((m_iPhysicalAddress >> 8) & 0xFF));
+    command.parameters.PushBack((uint8_t) (m_iPhysicalAddress & 0xFF));
 
+    lock.Leave();
     return m_processor->Transmit(command);
   }
   else
   {
     CStdString strLog;
-    strLog.Format("<< %x is not the active source", m_iLogicalAddress);
+    strLog.Format("<< %s (%X) is not the active source", GetLogicalAddressName(), m_iLogicalAddress);
     AddLog(CEC_LOG_DEBUG, strLog);
   }
 
   return false;
 }
 
-bool CCECBusDevice::TransmitActiveView(void)
-{
-  CStdString strLog;
-  strLog.Format("<< %x -> broadcast: active view (%4x)", m_iLogicalAddress, m_iPhysicalAddress);
-  AddLog(CEC_LOG_NOTICE, strLog);
-
-  cec_command command;
-  cec_command::format(command, m_iLogicalAddress, CECDEVICE_BROADCAST, CEC_OPCODE_ACTIVE_SOURCE);
-  command.parameters.push_back((m_iPhysicalAddress >> 8) & 0xFF);
-  command.parameters.push_back(m_iPhysicalAddress & 0xFF);
-
-  return m_processor->Transmit(command);
-}
-
 bool CCECBusDevice::TransmitCECVersion(cec_logical_address dest)
 {
+  CLockObject lock(&m_writeMutex);
   CStdString strLog;
-  strLog.Format("<< %x -> %x: cec version ", m_iLogicalAddress, dest);
-  switch (m_cecVersion)
-  {
-  case CEC_VERSION_1_2:
-    strLog.append("1.2");
-    break;
-  case CEC_VERSION_1_2A:
-    strLog.append("1.2a");
-    break;
-  case CEC_VERSION_1_3:
-    strLog.append("1.3");
-    break;
-  case CEC_VERSION_1_3A:
-    strLog.append("1.3a");
-    break;
-  default:
-    strLog.append("unknown");
-    break;
-  }
+  strLog.Format("<< %s (%X) -> %s (%X): cec version %s", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest, ToString(m_cecVersion));
   AddLog(CEC_LOG_NOTICE, strLog);
 
   cec_command command;
-  cec_command::format(command, m_iLogicalAddress, dest, CEC_OPCODE_CEC_VERSION);
-  command.parameters.push_back(m_cecVersion);
+  cec_command::Format(command, m_iLogicalAddress, dest, CEC_OPCODE_CEC_VERSION);
+  command.parameters.PushBack((uint8_t)m_cecVersion);
 
+  lock.Leave();
   return m_processor->Transmit(command);
 }
 
-bool CCECBusDevice::TransmitDeckStatus(cec_logical_address dest)
-{
-  // need to support opcodes play and deck control before doing anything with this
-  CStdString strLog;
-  strLog.Format("<< %x -> %x: deck status feature abort", m_iLogicalAddress, dest);
-  AddLog(CEC_LOG_NOTICE, strLog);
-
-  m_processor->TransmitAbort(dest, CEC_OPCODE_GIVE_DECK_STATUS);
-  return false;
-}
-
-bool CCECBusDevice::TransmitInactiveView(void)
+bool CCECBusDevice::TransmitInactiveSource(void)
 {
   CStdString strLog;
-  strLog.Format("<< %x -> broadcast: inactive view", m_iLogicalAddress);
+  strLog.Format("<< %s (%X) -> broadcast (F): inactive source", GetLogicalAddressName(), m_iLogicalAddress);
   AddLog(CEC_LOG_NOTICE, strLog);
 
   cec_command command;
-  cec_command::format(command, m_iLogicalAddress, CECDEVICE_BROADCAST, CEC_OPCODE_INACTIVE_SOURCE);
-  command.parameters.push_back((m_iPhysicalAddress >> 8) & 0xFF);
-  command.parameters.push_back(m_iPhysicalAddress & 0xFF);
+  cec_command::Format(command, m_iLogicalAddress, CECDEVICE_TV, CEC_OPCODE_INACTIVE_SOURCE);
+  command.parameters.PushBack((m_iPhysicalAddress >> 8) & 0xFF);
+  command.parameters.PushBack(m_iPhysicalAddress & 0xFF);
 
   return m_processor->Transmit(command);
 }
@@ -446,130 +668,177 @@ bool CCECBusDevice::TransmitInactiveView(void)
 bool CCECBusDevice::TransmitMenuState(cec_logical_address dest)
 {
   CStdString strLog;
-  strLog.Format("<< %x -> %x: ", m_iLogicalAddress, dest);
-  if (m_bMenuActive)
-    strLog.append("menu active");
-  else
-    strLog.append("menu inactive");
+  strLog.Format("<< %s (%X) -> %s (%X): menu state '%s'", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest, ToString(m_menuState));
   AddLog(CEC_LOG_NOTICE, strLog);
 
   cec_command command;
-  cec_command::format(command, m_iLogicalAddress, dest, CEC_OPCODE_MENU_STATUS);
-  command.parameters.push_back(m_bMenuActive ? (uint8_t) CEC_MENU_STATE_ACTIVATED : (uint8_t) CEC_MENU_STATE_DEACTIVATED);
+  cec_command::Format(command, m_iLogicalAddress, dest, CEC_OPCODE_MENU_STATUS);
+  command.parameters.PushBack((uint8_t)m_menuState);
 
   return m_processor->Transmit(command);
 }
 
 bool CCECBusDevice::TransmitOSDName(cec_logical_address dest)
 {
+  CLockObject lock(&m_writeMutex);
   CStdString strLog;
-  strLog.Format("<< %x -> %x: OSD name '%s'", m_iLogicalAddress, dest, m_strDeviceName.c_str());
+  strLog.Format("<< %s (%X) -> %s (%X): OSD name '%s'", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest, m_strDeviceName.c_str());
   AddLog(CEC_LOG_NOTICE, strLog.c_str());
 
   cec_command command;
-  cec_command::format(command, m_iLogicalAddress, dest, CEC_OPCODE_SET_OSD_NAME);
+  cec_command::Format(command, m_iLogicalAddress, dest, CEC_OPCODE_SET_OSD_NAME);
   for (unsigned int iPtr = 0; iPtr < m_strDeviceName.length(); iPtr++)
-    command.parameters.push_back(m_strDeviceName.at(iPtr));
+    command.parameters.PushBack(m_strDeviceName.at(iPtr));
 
+  lock.Leave();
   return m_processor->Transmit(command);
 }
 
 bool CCECBusDevice::TransmitOSDString(cec_logical_address dest, cec_display_control duration, const char *strMessage)
 {
+  CLockObject lock(&m_writeMutex);
   CStdString strLog;
-  strLog.Format("<< %x -> %x: display OSD message '%s'", m_iLogicalAddress, dest, strMessage);
+  strLog.Format("<< %s (%X) -> %s (%X): display OSD message '%s'", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest, strMessage);
   AddLog(CEC_LOG_NOTICE, strLog.c_str());
 
   cec_command command;
-  cec_command::format(command, m_iLogicalAddress, dest, CEC_OPCODE_SET_OSD_STRING);
-  command.parameters.push_back((uint8_t)duration);
+  cec_command::Format(command, m_iLogicalAddress, dest, CEC_OPCODE_SET_OSD_STRING);
+  command.parameters.PushBack((uint8_t)duration);
 
   unsigned int iLen = strlen(strMessage);
   if (iLen > 13) iLen = 13;
 
   for (unsigned int iPtr = 0; iPtr < iLen; iPtr++)
-    command.parameters.push_back(strMessage[iPtr]);
+    command.parameters.PushBack(strMessage[iPtr]);
 
+  lock.Leave();
   return m_processor->Transmit(command);
 }
 
 bool CCECBusDevice::TransmitPhysicalAddress(void)
 {
+  CLockObject lock(&m_writeMutex);
   CStdString strLog;
-  strLog.Format("<< %x -> broadcast: physical adddress %4x", m_iLogicalAddress, m_iPhysicalAddress);
+  strLog.Format("<< %s (%X) -> broadcast (F): physical adddress %4x", GetLogicalAddressName(), m_iLogicalAddress, m_iPhysicalAddress);
   AddLog(CEC_LOG_NOTICE, strLog.c_str());
 
   cec_command command;
-  cec_command::format(command, m_iLogicalAddress, CECDEVICE_BROADCAST, CEC_OPCODE_REPORT_PHYSICAL_ADDRESS);
-  command.parameters.push_back((uint8_t) ((m_iPhysicalAddress >> 8) & 0xFF));
-  command.parameters.push_back((uint8_t) (m_iPhysicalAddress & 0xFF));
-  command.parameters.push_back((uint8_t) (m_type));
+  cec_command::Format(command, m_iLogicalAddress, CECDEVICE_BROADCAST, CEC_OPCODE_REPORT_PHYSICAL_ADDRESS);
+  command.parameters.PushBack((uint8_t) ((m_iPhysicalAddress >> 8) & 0xFF));
+  command.parameters.PushBack((uint8_t) (m_iPhysicalAddress & 0xFF));
+  command.parameters.PushBack((uint8_t) (m_type));
 
+  lock.Leave();
   return m_processor->Transmit(command);
 }
 
 bool CCECBusDevice::TransmitPoll(cec_logical_address dest)
 {
   bool bReturn(false);
-
   if (dest == CECDEVICE_UNKNOWN)
     dest = m_iLogicalAddress;
 
   CStdString strLog;
-  strLog.Format("<< %x -> %x: POLL", m_iLogicalAddress, dest);
+  strLog.Format("<< %s (%X) -> %s (%X): POLL", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest);
   AddLog(CEC_LOG_NOTICE, strLog.c_str());
 
   cec_command command;
-  cec_command::format(command, m_iLogicalAddress, dest, CEC_OPCODE_NONE);
-  CLockObject lock(&m_mutex);
+  cec_command::Format(command, m_iLogicalAddress, dest, CEC_OPCODE_NONE);
+
+  {
+    CLockObject lock(&m_transmitMutex);
+    bReturn = m_processor->Transmit(command);
+  }
 
-  bReturn = m_processor->Transmit(command);
   AddLog(CEC_LOG_DEBUG, bReturn ? ">> POLL sent" : ">> POLL not sent");
+
+  if (bReturn)
+  {
+    CLockObject lock(&m_writeMutex);
+    m_iLastActive = GetTimeMs();
+  }
+
   return bReturn;
 }
 
 bool CCECBusDevice::TransmitPowerState(cec_logical_address dest)
 {
+  CLockObject lock(&m_writeMutex);
   CStdString strLog;
-  strLog.Format("<< %x -> %x: ", m_iLogicalAddress, dest);
+  strLog.Format("<< %s (%X) -> %s (%X): %s", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest, ToString(m_powerStatus));
+  AddLog(CEC_LOG_NOTICE, strLog.c_str());
 
-  switch (m_powerStatus)
+  cec_command command;
+  cec_command::Format(command, m_iLogicalAddress, dest, CEC_OPCODE_REPORT_POWER_STATUS);
+  command.parameters.PushBack((uint8_t) m_powerStatus);
+
+  lock.Leave();
+  return m_processor->Transmit(command);
+}
+
+bool CCECBusDevice::TransmitVendorID(cec_logical_address dest)
+{
+  CLockObject lock(&m_writeMutex);
+  if (m_vendor == CEC_VENDOR_UNKNOWN)
   {
-  case CEC_POWER_STATUS_ON:
-    strLog.append("powered on");
-    break;
-  case CEC_POWER_STATUS_STANDBY:
-    strLog.append("in standby mode");
-    break;
-  case CEC_POWER_STATUS_IN_TRANSITION_ON_TO_STANDBY:
-    strLog.append("in transition from on to standby");
-    break;
-  case CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON:
-    strLog.append("in transition from standby to on");
-    break;
-  default:
-    strLog.append("power state unknown");
-    break;
+    CStdString strLog;
+    strLog.Format("<< %s (%X) -> %s (%X): vendor id feature abort", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest);
+    AddLog(CEC_LOG_NOTICE, strLog);
+
+    lock.Leave();
+    m_processor->TransmitAbort(dest, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
+    return false;
   }
-  AddLog(CEC_LOG_NOTICE, strLog.c_str());
+  else
+  {
+    CStdString strLog;
+    strLog.Format("<< %s (%X) -> %s (%X): vendor id %s (%x)", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest, ToString(m_vendor), (uint64_t)m_vendor);
+    AddLog(CEC_LOG_NOTICE, strLog);
 
-  strLog.Format("<< reporting power status '%d'", m_powerStatus);
-  AddLog(CEC_LOG_NOTICE, strLog);
+    cec_command command;
+    cec_command::Format(command, m_iLogicalAddress, CECDEVICE_BROADCAST, CEC_OPCODE_DEVICE_VENDOR_ID);
+
+    command.parameters.PushBack((uint8_t) (((uint64_t)m_vendor >> 16) & 0xFF));
+    command.parameters.PushBack((uint8_t) (((uint64_t)m_vendor >> 8) & 0xFF));
+    command.parameters.PushBack((uint8_t) ((uint64_t)m_vendor & 0xFF));
+
+    lock.Leave();
+    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_iLogicalAddress, dest, CEC_OPCODE_REPORT_POWER_STATUS);
-  command.parameters.push_back((uint8_t) m_powerStatus);
+  cec_command::Format(command, m_processor->GetLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_USER_CONTROL_PRESSED);
+  command.parameters.PushBack((uint8_t)key);
+
+  if (bWait)
+  {
+    if (m_processor->Transmit(command))
+      return m_condition.Wait(&m_transmitMutex, 1000);
+    return false;
+  }
 
   return m_processor->Transmit(command);
 }
 
-bool CCECBusDevice::TransmitVendorID(cec_logical_address dest)
+bool CCECBusDevice::SendKeyRelease(bool bWait /* = false */)
 {
-  CStdString strLog;
-  strLog.Format("<< %x -> %x: vendor id feature abort", m_iLogicalAddress, dest);
-  AddLog(CEC_LOG_NOTICE, strLog);
+  CLockObject lock(&m_transmitMutex);
+  cec_command command;
+  cec_command::Format(command, m_processor->GetLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_USER_CONTROL_RELEASE);
 
-  m_processor->TransmitAbort(dest, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
-  return false;
+  if (bWait)
+  {
+    if (m_processor->Transmit(command))
+      return m_condition.Wait(&m_transmitMutex, 1000);
+    return false;
+  }
+  else
+  {
+    return m_processor->Transmit(command);
+  }
 }
 //@}