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

diff --git a/src/lib/devices/CECBusDevice.cpp b/src/lib/devices/CECBusDevice.cpp
index 4e15fb7..e46e82d 100644
--- a/src/lib/devices/CECBusDevice.cpp
+++ b/src/lib/devices/CECBusDevice.cpp
@@ -35,60 +35,35 @@
 #include "../implementations/ANCommandHandler.h"
 #include "../implementations/CECCommandHandler.h"
 #include "../implementations/SLCommandHandler.h"
+#include "../implementations/VLCommandHandler.h"
 #include "../platform/timeutils.h"
 
 using namespace CEC;
 
+#define ToString(p) CCECCommandHandler::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_iVendorClass(CEC_VENDOR_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_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_strDeviceName = ToString(m_iLogicalAddress);
 }
 
 CCECBusDevice::~CCECBusDevice(void)
@@ -97,14 +72,123 @@ 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 == CEC_VENDOR_UNKNOWN &&
+      GetTimeMs() - m_iLastCommandSent > 5000 &&
+      !m_processor->IsMonitoring())
+  {
+    CStdString strLog;
+    strLog.Format("<< requesting vendor ID of '%s' (%X)", GetLogicalAddressName(), m_iLogicalAddress);
+    AddLog(CEC_LOG_NOTICE, strLog);
+    m_iLastCommandSent = 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)
+{
+  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);
+
+    return m_processor->Transmit(command);
+  }
+
+  return true;
+}
+
+bool CCECBusDevice::Standby(void)
+{
+  CStdString strLog;
+  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);
+
+  return m_processor->Transmit(command);
+}
+
+/** @name Getters */
+//@{
+cec_version CCECBusDevice::GetCecVersion(void)
+{
+  if (m_cecVersion == CEC_VERSION_UNKNOWN)
+  {
+    if (!MyLogicalAddressContains(m_iLogicalAddress))
+    {
+      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_mutex);
+      if (m_processor->Transmit(command))
+        m_condition.Wait(&m_mutex, 1000);
+    }
+  }
+
+  return m_cecVersion;
+}
+
+const char* CCECBusDevice::GetLogicalAddressName(void) const
+{
+  return ToString(m_iLogicalAddress);
+}
+
+cec_menu_language &CCECBusDevice::GetMenuLanguage(void)
+{
+  if (!strcmp(m_menuLanguage.language, "???"))
+  {
+    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_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,79 +196,152 @@ 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))
+    {
+      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_mutex);
+      if (m_processor->Transmit(command))
+        m_condition.Wait(&m_mutex, 1000);
+    }
+  }
+
+  return m_powerStatus;
 }
 
-void CCECBusDevice::SetMenuLanguage(const cec_menu_language &language)
+cec_vendor_id CCECBusDevice::GetVendorId(void)
 {
-  if (language.device == m_iLogicalAddress)
+  if (m_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))
+    {
+      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_mutex);
+
+      if (m_processor->Transmit(command))
+        m_condition.Wait(&m_mutex, 1000);
+    }
   }
+
+  return m_vendor;
+}
+
+const char *CCECBusDevice::GetVendorName(void)
+{
+  GetVendorId();
+  return ToString(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;
   m_cecVersion = newVersion;
 
-  switch (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)
+{
+  if (language.device == m_iLogicalAddress)
   {
-  case CEC_VERSION_1_2:
-    strLog.Format("device %d reports CEC version 1.2", m_iLogicalAddress);
-    break;
-  case CEC_VERSION_1_2A:
-    strLog.Format("device %d reports CEC version 1.2a", m_iLogicalAddress);
-    break;
-  case CEC_VERSION_1_3:
-    strLog.Format("device %d reports CEC version 1.3", m_iLogicalAddress);
-    break;
-  case CEC_VERSION_1_3A:
-    strLog.Format("device %d reports CEC version 1.3a", m_iLogicalAddress);
-    break;
-  default:
-    strLog.Format("device %d reports an unknown CEC version", m_iLogicalAddress);
-    m_cecVersion = CEC_VERSION_UNKNOWN;
-    break;
+    CStdString strLog;
+    strLog.Format(">> %s (%X): menu language set to '%s'", GetLogicalAddressName(), m_iLogicalAddress, language.language);
+    m_processor->AddLog(CEC_LOG_DEBUG, strLog);
+    m_menuLanguage = language;
   }
-  AddLog(CEC_LOG_DEBUG, strLog);
 }
 
-void CCECBusDevice::SetPowerStatus(const cec_power_status powerStatus)
+void CCECBusDevice::SetMenuState(const cec_menu_state state)
 {
-  if (m_powerStatus != powerStatus)
+  if (m_menuState != state)
   {
     CStdString strLog;
-    strLog.Format("device %d power status changed from %2x to %2x", m_iLogicalAddress, m_powerStatus, powerStatus);
+    strLog.Format(">> %s (%X): menu state set to '%s'", GetLogicalAddressName(), m_iLogicalAddress, ToString(m_menuState));
     m_processor->AddLog(CEC_LOG_DEBUG, strLog);
-    m_powerStatus = powerStatus;
+    m_menuState = state;
   }
 }
 
-void CCECBusDevice::SetVendorId(const cec_datapacket &data)
+void CCECBusDevice::SetInactiveDevice(void)
+{
+  CLockObject lock(&m_mutex);
+  m_bActiveSource = false;
+}
+
+void CCECBusDevice::SetActiveDevice(void)
 {
-  if (data.size < 3)
+  CLockObject lock(&m_mutex);
+
+  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;
+}
+
+void CCECBusDevice::SetPhysicalAddress(uint16_t iNewAddress)
+{
+  if (iNewAddress > 0)
   {
-    AddLog(CEC_LOG_WARNING, "invalid vendor ID received");
-    return;
+    CStdString strLog;
+    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;
   }
+}
+
+void CCECBusDevice::SetStreamPath(uint16_t iNewAddress, uint16_t iOldAddress /* = 0 */)
+{
+  if (iNewAddress > 0)
+  {
+    CStdString strLog;
+    strLog.Format(">> %s (%X): stream path changed from %04x to %04x", GetLogicalAddressName(), m_iLogicalAddress, iOldAddress, iNewAddress);
+    AddLog(CEC_LOG_DEBUG, strLog.c_str());
 
-  uint64_t iVendorId = ((uint64_t)data[0] << 3) +
-                       ((uint64_t)data[1] << 2) +
-                        (uint64_t)data[2];
+    m_iStreamPath = iNewAddress;
 
-  SetVendorId(iVendorId, data.size >= 4 ? data[3] : 0);
+    if (iNewAddress > 0)
+      SetPowerStatus(CEC_POWER_STATUS_ON);
+  }
 }
 
-void CCECBusDevice::SetVendorId(uint64_t iVendorId, uint8_t iVendorClass /* = 0 */)
+void CCECBusDevice::SetPowerStatus(const cec_power_status powerStatus)
 {
-  m_vendor.vendor = (cec_vendor_id)iVendorId;
-  m_iVendorClass = iVendorClass;
+  if (m_powerStatus != powerStatus)
+  {
+    CStdString strLog;
+    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)
+{
+  m_vendor = (cec_vendor_id)iVendorId;
 
   switch (iVendorId)
   {
@@ -202,6 +359,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)
     {
@@ -212,281 +376,190 @@ void CCECBusDevice::SetVendorId(uint64_t iVendorId, uint8_t iVendorClass /* = 0
   }
 
   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, GetVendorName(), GetVendorId());
   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)
+  if (m_powerStatus != CEC_POWER_STATUS_ON)
   {
-    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);
+    CStdString strLog;
+    strLog.Format("<< %s (%X) is not powered on", GetLogicalAddressName(), m_iLogicalAddress);
+    AddLog(CEC_LOG_DEBUG, strLog);
   }
-
-  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)
+  else if (m_bActiveSource)
   {
-    m_iLastActive = GetTimeMs();
+    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, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
-    if (m_processor->Transmit(command))
-      m_condition.Wait(&m_mutex, 1000);
-  }
-}
+    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));
 
-void CCECBusDevice::SetPhysicalAddress(uint16_t iNewAddress, uint16_t iOldAddress /* = 0 */)
-{
-  if (iNewAddress > 0)
+    return m_processor->Transmit(command);
+  }
+  else
   {
     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;
+    strLog.Format("<< %s (%X) is not the active source", GetLogicalAddressName(), m_iLogicalAddress);
+    AddLog(CEC_LOG_DEBUG, strLog);
   }
-}
-
-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);
+  return false;
 }
 
-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("<< %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, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_STANDBY);
+  cec_command::Format(command, m_iLogicalAddress, dest, CEC_OPCODE_CEC_VERSION);
+  command.parameters.PushBack((uint8_t)m_cecVersion);
 
   return m_processor->Transmit(command);
 }
 
-bool CCECBusDevice::SetOSDString(cec_display_control duration, const char *strMessage)
+bool CCECBusDevice::TransmitInactiveView(void)
 {
   CStdString strLog;
-  strLog.Format("<< display message '%s'", strMessage);
-  AddLog(CEC_LOG_NOTICE, strLog.c_str());
+  strLog.Format("<< %s (%X) -> broadcast (F): inactive view", GetLogicalAddressName(), m_iLogicalAddress);
+  AddLog(CEC_LOG_NOTICE, strLog);
 
   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]);
+  cec_command::Format(command, m_iLogicalAddress, CECDEVICE_BROADCAST, CEC_OPCODE_INACTIVE_SOURCE);
+  command.parameters.PushBack((m_iPhysicalAddress >> 8) & 0xFF);
+  command.parameters.PushBack(m_iPhysicalAddress & 0xFF);
 
   return m_processor->Transmit(command);
 }
 
-bool CCECBusDevice::ReportCECVersion(cec_logical_address dest)
+bool CCECBusDevice::TransmitMenuState(cec_logical_address dest)
 {
-  AddLog(CEC_LOG_NOTICE, "<< reporting CEC version as 1.3a");
+  CStdString strLog;
+  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_CEC_VERSION);
-  command.parameters.push_back(CEC_VERSION_1_3A);
+  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::ReportDeckStatus(cec_logical_address dest)
+bool CCECBusDevice::TransmitOSDName(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 */)
-{
-  if (bActive)
-    AddLog(CEC_LOG_NOTICE, "<< reporting menu state as active");
-  else
-    AddLog(CEC_LOG_NOTICE, "<< reporting menu state as inactive");
+  CStdString strLog;
+  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_MENU_STATUS);
-  command.parameters.push_back(bActive ? (uint8_t) CEC_MENU_STATE_ACTIVATED : (uint8_t) CEC_MENU_STATE_DEACTIVATED);
+  cec_command::Format(command, m_iLogicalAddress, dest, CEC_OPCODE_SET_OSD_NAME);
+  for (unsigned int iPtr = 0; iPtr < m_strDeviceName.length(); iPtr++)
+    command.parameters.PushBack(m_strDeviceName.at(iPtr));
 
   return m_processor->Transmit(command);
 }
 
-bool CCECBusDevice::ReportOSDName(cec_logical_address dest)
+bool CCECBusDevice::TransmitOSDString(cec_logical_address dest, cec_display_control duration, const char *strMessage)
 {
   CStdString strLog;
-  strLog.Format("<< reporting OSD name as %s", m_strDeviceName.c_str());
+  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_NAME);
-  for (unsigned int iPtr = 0; iPtr < m_strDeviceName.length(); iPtr++)
-    command.parameters.push_back(m_strDeviceName.at(iPtr));
+  cec_command::Format(command, m_iLogicalAddress, dest, CEC_OPCODE_SET_OSD_STRING);
+  command.parameters.PushBack((uint8_t)duration);
 
-  return m_processor->Transmit(command);
-}
+  unsigned int iLen = strlen(strMessage);
+  if (iLen > 13) iLen = 13;
 
-bool CCECBusDevice::ReportPowerState(cec_logical_address dest)
-{
-  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);
+  for (unsigned int iPtr = 0; iPtr < iLen; iPtr++)
+    command.parameters.PushBack(strMessage[iPtr]);
 
   return m_processor->Transmit(command);
 }
 
-bool CCECBusDevice::ReportVendorID(cec_logical_address dest)
+bool CCECBusDevice::TransmitPhysicalAddress(void)
 {
-  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("<< %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_ACTIVE_SOURCE);
-  command.parameters.push_back((m_iPhysicalAddress >> 8) & 0xFF);
-  command.parameters.push_back(m_iPhysicalAddress & 0xFF);
+  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));
 
   return m_processor->Transmit(command);
 }
 
-bool CCECBusDevice::BroadcastInactiveView(void)
+bool CCECBusDevice::TransmitPoll(cec_logical_address dest)
 {
-  AddLog(CEC_LOG_DEBUG, "<< setting inactive view");
+  bool bReturn(false);
 
-  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);
+  if (dest == CECDEVICE_UNKNOWN)
+    dest = m_iLogicalAddress;
 
-  return m_processor->Transmit(command);
-}
-
-bool CCECBusDevice::BroadcastPhysicalAddress(void)
-{
   CStdString strLog;
-  strLog.Format("<< reporting physical address as %04x", m_iPhysicalAddress);
+  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, 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));
+  cec_command::Format(command, m_iLogicalAddress, dest, CEC_OPCODE_NONE);
+  CLockObject lock(&m_mutex);
 
-  return m_processor->Transmit(command);
+  bReturn = m_processor->Transmit(command);
+  AddLog(CEC_LOG_DEBUG, bReturn ? ">> POLL sent" : ">> POLL not sent");
+  return bReturn;
 }
 
-bool CCECBusDevice::BroadcastActiveSource(void)
+bool CCECBusDevice::TransmitPowerState(cec_logical_address dest)
 {
-  AddLog(CEC_LOG_NOTICE, "<< broadcasting active source");
+  CStdString strLog;
+  strLog.Format("<< %s (%X) -> %s (%X): %s", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest, ToString(m_powerStatus));
+  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((uint8_t) ((m_iPhysicalAddress >> 8) & 0xFF));
-  command.parameters.push_back((uint8_t) (m_iPhysicalAddress & 0xFF));
+  cec_command::Format(command, m_iLogicalAddress, dest, CEC_OPCODE_REPORT_POWER_STATUS);
+  command.parameters.PushBack((uint8_t) m_powerStatus);
 
   return m_processor->Transmit(command);
 }
 
-cec_version CCECBusDevice::GetCecVersion(bool bRefresh /* = true */)
+bool CCECBusDevice::TransmitVendorID(cec_logical_address dest)
 {
-  if (bRefresh || m_cecVersion == CEC_VERSION_UNKNOWN)
+  if (m_vendor == CEC_VENDOR_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);
-  }
-
-  return m_cecVersion;
-}
+    CStdString strLog;
+    strLog.Format("<< %s (%X) -> %s (%X): vendor id feature abort", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest);
+    AddLog(CEC_LOG_NOTICE, strLog);
 
-cec_menu_language &CCECBusDevice::GetMenuLanguage(bool bRefresh /* = true */)
-{
-  if (bRefresh || !strcmp(m_menuLanguage.language, "???"))
-  {
-    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);
+    m_processor->TransmitAbort(dest, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
+    return false;
   }
-
-  return m_menuLanguage;
-}
-
-cec_power_status CCECBusDevice::GetPowerStatus(bool bRefresh /* = true */)
-{
-  if (bRefresh || m_powerStatus == CEC_POWER_STATUS_UNKNOWN)
+  else
   {
-    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;
-}
-
-bool CCECBusDevice::PollDevice(cec_logical_address source /* = CECDEVICE_UNKNOWN */)
-{
-  bool bReturn(false);
-
-  if (source == CECDEVICE_UNKNOWN)
-    source = GetMyLogicalAddress();
+    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);
 
-  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, m_iLogicalAddress, CECDEVICE_BROADCAST, CEC_OPCODE_DEVICE_VENDOR_ID);
 
-  cec_command command;
-  cec_command::format(command, source, m_iLogicalAddress, CEC_OPCODE_NONE);
-  CLockObject lock(&m_mutex);
+    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));
 
-  bReturn = m_processor->Transmit(command);
-  AddLog(CEC_LOG_DEBUG, bReturn ? ">> POLL sent" : ">> POLL not sent");
-  return bReturn;
+    return m_processor->Transmit(command);
+  }
 }
+//@}