X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fdevices%2FCECBusDevice.cpp;h=77e646174ba5975df4748429d02ad832885881bf;hb=e5e86c76b70975d8a8c03c58a230a70726399906;hp=4e15fb795bd4ff5dd75f61564dd17bdc9a978003;hpb=2e8207ce0d15b3c25d97eba8740f3ca80364d03c;p=deb_libcec.git

diff --git a/src/lib/devices/CECBusDevice.cpp b/src/lib/devices/CECBusDevice.cpp
index 4e15fb7..77e6461 100644
--- a/src/lib/devices/CECBusDevice.cpp
+++ b/src/lib/devices/CECBusDevice.cpp
@@ -35,6 +35,7 @@
 #include "../implementations/ANCommandHandler.h"
 #include "../implementations/CECCommandHandler.h"
 #include "../implementations/SLCommandHandler.h"
+#include "../implementations/VLCommandHandler.h"
 #include "../platform/timeutils.h"
 
 using namespace CEC;
@@ -44,51 +45,21 @@ CCECBusDevice::CCECBusDevice(CCECProcessor *processor, cec_logical_address iLogi
   m_iLogicalAddress(iLogicalAddress),
   m_powerStatus(CEC_POWER_STATUS_UNKNOWN),
   m_processor(processor),
+  m_bMenuActive(true),
   m_iVendorClass(CEC_VENDOR_UNKNOWN),
   m_iLastActive(0),
-  m_cecVersion(CEC_VERSION_UNKNOWN)
+  m_cecVersion(CEC_VERSION_1_3A)
 {
   m_handler = new CCECCommandHandler(this);
+
   for (unsigned int iPtr = 0; iPtr < 4; iPtr++)
     m_menuLanguage.language[iPtr] = '?';
   m_menuLanguage.language[3] = 0;
   m_menuLanguage.device = iLogicalAddress;
-  m_vendor.vendor = CEC_VENDOR_UNKNOWN;
 
-  switch(iLogicalAddress)
-  {
-  case CECDEVICE_AUDIOSYSTEM:
-    m_type          = CEC_DEVICE_TYPE_AUDIO_SYSTEM;
-    m_strDeviceName = "Audio";
-    break;
-  case CECDEVICE_PLAYBACKDEVICE1:
-  case CECDEVICE_PLAYBACKDEVICE2:
-  case CECDEVICE_PLAYBACKDEVICE3:
-    m_type          = CEC_DEVICE_TYPE_PLAYBACK_DEVICE;
-    m_strDeviceName = "Player";
-    break;
-  case CECDEVICE_RECORDINGDEVICE1:
-  case CECDEVICE_RECORDINGDEVICE2:
-  case CECDEVICE_RECORDINGDEVICE3:
-    m_type          = CEC_DEVICE_TYPE_RECORDING_DEVICE;
-    m_strDeviceName = "Recorder";
-    break;
-  case CECDEVICE_TUNER1:
-  case CECDEVICE_TUNER2:
-  case CECDEVICE_TUNER3:
-  case CECDEVICE_TUNER4:
-    m_type          = CEC_DEVICE_TYPE_TUNER;
-    m_strDeviceName = "Tuner";
-    break;
-  case CECDEVICE_TV:
-    m_type          = CEC_DEVICE_TYPE_TV;
-    m_strDeviceName = "TV";
-    break;
-  default:
-    m_type          = CEC_DEVICE_TYPE_RESERVED;
-    m_strDeviceName = "Unknown";
-    break;
-  }
+  m_vendor.vendor = CEC_VENDOR_UNKNOWN;
+  m_type          = CEC_DEVICE_TYPE_RESERVED;
+  m_strDeviceName = "Unknown";
 }
 
 CCECBusDevice::~CCECBusDevice(void)
@@ -97,14 +68,101 @@ CCECBusDevice::~CCECBusDevice(void)
   delete m_handler;
 }
 
-cec_logical_address CCECBusDevice::GetMyLogicalAddress(void) const
+void CCECBusDevice::AddLog(cec_log_level level, const CStdString &strMessage)
 {
-  return m_processor->GetLogicalAddress();
+  m_processor->AddLog(level, strMessage);
 }
 
-bool CCECBusDevice::MyLogicalAddressContains(cec_logical_address address) const
+bool CCECBusDevice::HandleCommand(const cec_command &command)
 {
-  return m_processor->HasLogicalAddress(address);
+  CLockObject lock(&m_mutex);
+  m_iLastActive = GetTimeMs();
+  m_handler->HandleCommand(command);
+  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_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);
+  AddLog(CEC_LOG_DEBUG, strLog.c_str());
+
+  cec_command command;
+  cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_IMAGE_VIEW_ON);
+
+  return m_processor->Transmit(command);
+}
+
+bool CCECBusDevice::Standby(void)
+{
+  CStdString strLog;
+  strLog.Format("<< putting device with logical address %d in standby mode", (int8_t)m_iLogicalAddress);
+  AddLog(CEC_LOG_DEBUG, strLog.c_str());
+
+  cec_command command;
+  cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_STANDBY);
+
+  return m_processor->Transmit(command);
+}
+
+/** @name Getters */
+//@{
+cec_version CCECBusDevice::GetCecVersion(void)
+{
+  if (m_cecVersion == CEC_VERSION_UNKNOWN)
+  {
+    if (!MyLogicalAddressContains(m_iLogicalAddress))
+    {
+      AddLog(CEC_LOG_NOTICE, "<< requesting CEC version");
+      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);
+    }
+  }
+
+  return m_cecVersion;
+}
+
+cec_menu_language &CCECBusDevice::GetMenuLanguage(void)
+{
+  if (!strcmp(m_menuLanguage.language, "???"))
+  {
+    if (!MyLogicalAddressContains(m_iLogicalAddress))
+    {
+      AddLog(CEC_LOG_NOTICE, "<< requesting menu language");
+      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);
+    }
+  }
+
+  return m_menuLanguage;
+}
+
+cec_logical_address CCECBusDevice::GetMyLogicalAddress(void) const
+{
+  return m_processor->GetLogicalAddress();
 }
 
 uint16_t CCECBusDevice::GetMyPhysicalAddress(void) const
@@ -112,22 +170,52 @@ uint16_t CCECBusDevice::GetMyPhysicalAddress(void) const
   return m_processor->GetPhysicalAddress();
 }
 
-void CCECBusDevice::AddLog(cec_log_level level, const CStdString &strMessage)
+cec_power_status CCECBusDevice::GetPowerStatus(void)
 {
-  m_processor->AddLog(level, strMessage);
+  if (m_powerStatus == CEC_POWER_STATUS_UNKNOWN)
+  {
+    if (!MyLogicalAddressContains(m_iLogicalAddress))
+    {
+      AddLog(CEC_LOG_NOTICE, "<< requesting power status");
+      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);
+    }
+  }
+
+  return m_powerStatus;
 }
 
-void CCECBusDevice::SetMenuLanguage(const cec_menu_language &language)
+const cec_vendor &CCECBusDevice::GetVendor(void)
 {
-  if (language.device == m_iLogicalAddress)
+  if (m_vendor.vendor == CEC_VENDOR_UNKNOWN)
   {
-    CStdString strLog;
-    strLog.Format("device %d menu language set to '%s'", m_iLogicalAddress, language.language);
-    m_processor->AddLog(CEC_LOG_DEBUG, strLog);
-    m_menuLanguage = language;
+    if (!MyLogicalAddressContains(m_iLogicalAddress))
+    {
+      AddLog(CEC_LOG_NOTICE, "<< requesting vendor ID");
+      cec_command command;
+      cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
+      CLockObject lock(&m_mutex);
+
+      if (m_processor->Transmit(command))
+        m_condition.Wait(&m_mutex, 1000);
+    }
   }
+
+  return m_vendor;
+}
+
+bool CCECBusDevice::MyLogicalAddressContains(cec_logical_address address) const
+{
+  return m_processor->HasLogicalAddress(address);
 }
 
+//@}
+
+/** @name Setters */
+//@{
 void CCECBusDevice::SetCecVersion(const cec_version newVersion)
 {
   CStdString strLog;
@@ -155,6 +243,29 @@ void CCECBusDevice::SetCecVersion(const cec_version newVersion)
   AddLog(CEC_LOG_DEBUG, strLog);
 }
 
+void CCECBusDevice::SetMenuLanguage(const cec_menu_language &language)
+{
+  if (language.device == m_iLogicalAddress)
+  {
+    CStdString strLog;
+    strLog.Format("device %d menu language set to '%s'", m_iLogicalAddress, language.language);
+    m_processor->AddLog(CEC_LOG_DEBUG, strLog);
+    m_menuLanguage = language;
+  }
+}
+
+void CCECBusDevice::SetPhysicalAddress(uint16_t iNewAddress, uint16_t iOldAddress /* = 0 */)
+{
+  if (iNewAddress > 0)
+  {
+    CStdString strLog;
+    strLog.Format(">> %i changed physical address from %04x to %04x", m_iLogicalAddress, m_iPhysicalAddress, iNewAddress);
+    AddLog(CEC_LOG_DEBUG, strLog.c_str());
+
+    m_iPhysicalAddress = iNewAddress;
+  }
+}
+
 void CCECBusDevice::SetPowerStatus(const cec_power_status powerStatus)
 {
   if (m_powerStatus != powerStatus)
@@ -202,6 +313,13 @@ void CCECBusDevice::SetVendorId(uint64_t iVendorId, uint8_t iVendorClass /* = 0
       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)
     {
@@ -215,137 +333,115 @@ void CCECBusDevice::SetVendorId(uint64_t iVendorId, uint8_t iVendorClass /* = 0
   strLog.Format("device %d: vendor = %s (%06x) class = %2x", m_iLogicalAddress, GetVendorName(), GetVendorId(), GetVendorClass());
   m_processor->AddLog(CEC_LOG_DEBUG, strLog.c_str());
 }
+//@}
 
-bool CCECBusDevice::HandleCommand(const cec_command &command)
-{
-  CLockObject lock(&m_mutex);
-  m_iLastActive = GetTimeMs();
-  m_handler->HandleCommand(command);
-  m_condition.Signal();
-  return true;
-}
-
-const cec_vendor &CCECBusDevice::GetVendor(void)
+/** @name Transmit methods */
+//@{
+bool CCECBusDevice::TransmitActiveSource(void)
 {
-  if (m_vendor.vendor == CEC_VENDOR_UNKNOWN)
-  {
-    AddLog(CEC_LOG_NOTICE, "<< requesting vendor ID");
-    cec_command command;
-    cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
-    CLockObject lock(&m_mutex);
-
-    if (m_processor->Transmit(command))
-      m_condition.Wait(&m_mutex, 1000);
-  }
-
-  return m_vendor;
-}
-
-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_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);
-  }
-}
+  CStdString strLog;
+  strLog.Format("<< %x -> broadcast: active source (%4x)", m_iLogicalAddress, m_iPhysicalAddress);
+  AddLog(CEC_LOG_NOTICE, strLog);
 
-void CCECBusDevice::SetPhysicalAddress(uint16_t iNewAddress, uint16_t iOldAddress /* = 0 */)
-{
-  if (iNewAddress > 0)
-  {
-    CStdString strLog;
-    strLog.Format(">> %i changed physical address from %04x to %04x", m_iLogicalAddress, m_iPhysicalAddress, iNewAddress);
-    AddLog(CEC_LOG_DEBUG, strLog.c_str());
+  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));
 
-    m_iPhysicalAddress = iNewAddress;
-  }
+  return m_processor->Transmit(command);
 }
 
-bool CCECBusDevice::PowerOn(void)
+bool CCECBusDevice::TransmitActiveView(void)
 {
   CStdString strLog;
-  strLog.Format("<< powering on device with logical address %d", (int8_t)m_iLogicalAddress);
-  AddLog(CEC_LOG_DEBUG, strLog.c_str());
+  strLog.Format("<< %x -> broadcast: active view (%4x)", m_iLogicalAddress, m_iPhysicalAddress);
+  AddLog(CEC_LOG_NOTICE, strLog);
 
   cec_command command;
-  cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_IMAGE_VIEW_ON);
+  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::Standby(void)
+bool CCECBusDevice::TransmitCECVersion(cec_logical_address dest)
 {
   CStdString strLog;
-  strLog.Format("<< putting device with logical address %d in standby mode", (int8_t)m_iLogicalAddress);
-  AddLog(CEC_LOG_DEBUG, strLog.c_str());
+  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;
+  }
+  AddLog(CEC_LOG_NOTICE, strLog);
 
   cec_command command;
-  cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_STANDBY);
+  cec_command::format(command, m_iLogicalAddress, dest, CEC_OPCODE_CEC_VERSION);
+  command.parameters.push_back(m_cecVersion);
 
   return m_processor->Transmit(command);
 }
 
-bool CCECBusDevice::SetOSDString(cec_display_control duration, const char *strMessage)
+bool CCECBusDevice::TransmitDeckStatus(cec_logical_address dest)
 {
+  // need to support opcodes play and deck control before doing anything with this
   CStdString strLog;
-  strLog.Format("<< display message '%s'", strMessage);
-  AddLog(CEC_LOG_NOTICE, strLog.c_str());
-
-  cec_command command;
-  cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_SET_OSD_STRING);
-  command.parameters.push_back((uint8_t)duration);
-
-  for (unsigned int iPtr = 0; iPtr < strlen(strMessage); iPtr++)
-    command.parameters.push_back(strMessage[iPtr]);
+  strLog.Format("<< %x -> %x: deck status feature abort", m_iLogicalAddress, dest);
+  AddLog(CEC_LOG_NOTICE, strLog);
 
-  return m_processor->Transmit(command);
+  m_processor->TransmitAbort(dest, CEC_OPCODE_GIVE_DECK_STATUS);
+  return false;
 }
 
-bool CCECBusDevice::ReportCECVersion(cec_logical_address dest)
+bool CCECBusDevice::TransmitInactiveView(void)
 {
-  AddLog(CEC_LOG_NOTICE, "<< reporting CEC version as 1.3a");
+  CStdString strLog;
+  strLog.Format("<< %x -> broadcast: inactive view", m_iLogicalAddress);
+  AddLog(CEC_LOG_NOTICE, strLog);
 
   cec_command command;
-  cec_command::format(command, m_iLogicalAddress, dest, CEC_OPCODE_CEC_VERSION);
-  command.parameters.push_back(CEC_VERSION_1_3A);
+  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);
 
   return m_processor->Transmit(command);
 }
 
-bool CCECBusDevice::ReportDeckStatus(cec_logical_address dest)
-{
-  // need to support opcodes play and deck control before doing anything with this
-  AddLog(CEC_LOG_NOTICE, "<< deck status requested, feature abort");
-  m_processor->TransmitAbort(dest, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
-  return false;
-}
-
-bool CCECBusDevice::ReportMenuState(cec_logical_address dest, bool bActive /* = true */)
+bool CCECBusDevice::TransmitMenuState(cec_logical_address dest)
 {
-  if (bActive)
-    AddLog(CEC_LOG_NOTICE, "<< reporting menu state as active");
+  CStdString strLog;
+  strLog.Format("<< %x -> %x: ", m_iLogicalAddress, dest);
+  if (m_bMenuActive)
+    strLog.append("menu active");
   else
-    AddLog(CEC_LOG_NOTICE, "<< reporting menu state as inactive");
+    strLog.append("menu inactive");
+  AddLog(CEC_LOG_NOTICE, strLog);
 
   cec_command command;
   cec_command::format(command, m_iLogicalAddress, dest, CEC_OPCODE_MENU_STATUS);
-  command.parameters.push_back(bActive ? (uint8_t) CEC_MENU_STATE_ACTIVATED : (uint8_t) CEC_MENU_STATE_DEACTIVATED);
+  command.parameters.push_back(m_bMenuActive ? (uint8_t) CEC_MENU_STATE_ACTIVATED : (uint8_t) CEC_MENU_STATE_DEACTIVATED);
 
   return m_processor->Transmit(command);
 }
 
-bool CCECBusDevice::ReportOSDName(cec_logical_address dest)
+bool CCECBusDevice::TransmitOSDName(cec_logical_address dest)
 {
   CStdString strLog;
-  strLog.Format("<< reporting OSD name as %s", m_strDeviceName.c_str());
+  strLog.Format("<< %x -> %x: OSD name '%s'", m_iLogicalAddress, dest, m_strDeviceName.c_str());
   AddLog(CEC_LOG_NOTICE, strLog.c_str());
 
   cec_command command;
@@ -356,137 +452,102 @@ bool CCECBusDevice::ReportOSDName(cec_logical_address dest)
   return m_processor->Transmit(command);
 }
 
-bool CCECBusDevice::ReportPowerState(cec_logical_address dest)
+bool CCECBusDevice::TransmitOSDString(cec_logical_address dest, cec_display_control duration, const char *strMessage)
 {
-  AddLog(CEC_LOG_NOTICE, "<< reporting \"On\" power status");
-
-  cec_command command;
-  cec_command::format(command, m_iLogicalAddress, dest, CEC_OPCODE_REPORT_POWER_STATUS);
-//  command.parameters.push_back(bOn ? (uint8_t) CEC_POWER_STATUS_ON : (uint8_t) CEC_POWER_STATUS_STANDBY);
-  command.parameters.push_back((uint8_t) CEC_POWER_STATUS_ON);
-
-  return m_processor->Transmit(command);
-}
-
-bool CCECBusDevice::ReportVendorID(cec_logical_address dest)
-{
-  AddLog(CEC_LOG_NOTICE, "<< vendor ID requested, feature abort");
-  m_processor->TransmitAbort(dest, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
-  return false;
-}
-
-bool CCECBusDevice::BroadcastActiveView(void)
-{
-  AddLog(CEC_LOG_DEBUG, "<< setting active view");
+  CStdString strLog;
+  strLog.Format("<< %x -> %x: display OSD message '%s'", m_iLogicalAddress, dest, strMessage);
+  AddLog(CEC_LOG_NOTICE, strLog.c_str());
 
   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);
-}
+  cec_command::format(command, m_iLogicalAddress, dest, CEC_OPCODE_SET_OSD_STRING);
+  command.parameters.push_back((uint8_t)duration);
 
-bool CCECBusDevice::BroadcastInactiveView(void)
-{
-  AddLog(CEC_LOG_DEBUG, "<< setting inactive view");
+  unsigned int iLen = strlen(strMessage);
+  if (iLen > 13) iLen = 13;
 
-  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);
+  for (unsigned int iPtr = 0; iPtr < iLen; iPtr++)
+    command.parameters.push_back(strMessage[iPtr]);
 
   return m_processor->Transmit(command);
 }
 
-bool CCECBusDevice::BroadcastPhysicalAddress(void)
+bool CCECBusDevice::TransmitPhysicalAddress(void)
 {
   CStdString strLog;
-  strLog.Format("<< reporting physical address as %04x", m_iPhysicalAddress);
+  strLog.Format("<< %x -> broadcast: physical adddress %4x", 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) (CEC_DEVICE_TYPE_PLAYBACK_DEVICE));
+  command.parameters.push_back((uint8_t) (m_type));
 
   return m_processor->Transmit(command);
 }
 
-bool CCECBusDevice::BroadcastActiveSource(void)
+bool CCECBusDevice::TransmitPoll(cec_logical_address dest)
 {
-  AddLog(CEC_LOG_NOTICE, "<< broadcasting active source");
+  bool bReturn(false);
 
-  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));
+  if (dest == CECDEVICE_UNKNOWN)
+    dest = m_iLogicalAddress;
 
-  return m_processor->Transmit(command);
-}
+  CStdString strLog;
+  strLog.Format("<< %x -> %x: POLL", m_iLogicalAddress, dest);
+  AddLog(CEC_LOG_NOTICE, strLog.c_str());
 
-cec_version CCECBusDevice::GetCecVersion(bool bRefresh /* = true */)
-{
-  if (bRefresh || m_cecVersion == CEC_VERSION_UNKNOWN)
-  {
-    AddLog(CEC_LOG_NOTICE, "<< requesting CEC version");
-    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);
-  }
+  cec_command command;
+  cec_command::format(command, m_iLogicalAddress, dest, CEC_OPCODE_NONE);
+  CLockObject lock(&m_mutex);
 
-  return m_cecVersion;
+  bReturn = m_processor->Transmit(command);
+  AddLog(CEC_LOG_DEBUG, bReturn ? ">> POLL sent" : ">> POLL not sent");
+  return bReturn;
 }
 
-cec_menu_language &CCECBusDevice::GetMenuLanguage(bool bRefresh /* = true */)
+bool CCECBusDevice::TransmitPowerState(cec_logical_address dest)
 {
-  if (bRefresh || !strcmp(m_menuLanguage.language, "???"))
+  CStdString strLog;
+  strLog.Format("<< %x -> %x: ", m_iLogicalAddress, dest);
+
+  switch (m_powerStatus)
   {
-    AddLog(CEC_LOG_NOTICE, "<< requesting menu language");
-    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);
+  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;
   }
+  AddLog(CEC_LOG_NOTICE, strLog.c_str());
 
-  return m_menuLanguage;
-}
+  strLog.Format("<< reporting power status '%d'", m_powerStatus);
+  AddLog(CEC_LOG_NOTICE, strLog);
 
-cec_power_status CCECBusDevice::GetPowerStatus(bool bRefresh /* = true */)
-{
-  if (bRefresh || m_powerStatus == CEC_POWER_STATUS_UNKNOWN)
-  {
-    AddLog(CEC_LOG_NOTICE, "<< requesting power status");
-    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);
-  }
+  cec_command command;
+  cec_command::format(command, m_iLogicalAddress, dest, CEC_OPCODE_REPORT_POWER_STATUS);
+  command.parameters.push_back((uint8_t) m_powerStatus);
 
-  return m_powerStatus;
+  return m_processor->Transmit(command);
 }
 
-bool CCECBusDevice::PollDevice(cec_logical_address source /* = CECDEVICE_UNKNOWN */)
+bool CCECBusDevice::TransmitVendorID(cec_logical_address dest)
 {
-  bool bReturn(false);
-
-  if (source == CECDEVICE_UNKNOWN)
-    source = GetMyLogicalAddress();
-
   CStdString strLog;
-  strLog.Format("<< sending POLL from device %1x to device %1x", (int8_t)source, m_iLogicalAddress);
-  AddLog(CEC_LOG_DEBUG, strLog);
-
-  cec_command command;
-  cec_command::format(command, source, m_iLogicalAddress, CEC_OPCODE_NONE);
-  CLockObject lock(&m_mutex);
+  strLog.Format("<< %x -> %x: vendor id feature abort", m_iLogicalAddress, dest);
+  AddLog(CEC_LOG_NOTICE, strLog);
 
-  bReturn = m_processor->Transmit(command);
-  AddLog(CEC_LOG_DEBUG, bReturn ? ">> POLL sent" : ">> POLL not sent");
-  return bReturn;
+  m_processor->TransmitAbort(dest, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
+  return false;
 }
+//@}