repositories / deb_libcec.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
cec: renamed all Broadcast...() and Report...() methods to Transmit...()
[deb_libcec.git] / src / lib / devices / CECBusDevice.cpp
diff --git a/src/lib/devices/CECBusDevice.cpp b/src/lib/devices/CECBusDevice.cpp
index 07d944eb32eefc0083d8356441f7ade4e9a6bac5..bfdda91d4a9f1f37d747005e679b9f27a415fc14 100644 (file)
--- a/src/lib/devices/CECBusDevice.cpp
+++ b/src/lib/devices/CECBusDevice.cpp
@@ -44,16 +44,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;
+  m_type          = CEC_DEVICE_TYPE_RESERVED;
+  m_strDeviceName = "Unknown";
 }
 
 CCECBusDevice::~CCECBusDevice(void)
@@ -67,6 +72,11 @@ cec_logical_address CCECBusDevice::GetMyLogicalAddress(void) const
   return m_processor->GetLogicalAddress();
 }
 
+bool CCECBusDevice::MyLogicalAddressContains(cec_logical_address address) const
+{
+  return m_processor->HasLogicalAddress(address);
+}
+
 uint16_t CCECBusDevice::GetMyPhysicalAddress(void) const
 {
   return m_processor->GetPhysicalAddress();
@@ -117,10 +127,13 @@ void CCECBusDevice::SetCecVersion(const cec_version newVersion)
 
 void CCECBusDevice::SetPowerStatus(const cec_power_status powerStatus)
 {
-  CStdString strLog;
-  strLog.Format("device %d power status changed from %2x to %2x", m_iLogicalAddress, m_powerStatus, powerStatus);
-  m_processor->AddLog(CEC_LOG_DEBUG, strLog);
-  m_powerStatus = powerStatus;
+  if (m_powerStatus != powerStatus)
+  {
+    CStdString strLog;
+    strLog.Format("device %d power status changed from %2x to %2x", m_iLogicalAddress, m_powerStatus, powerStatus);
+    m_processor->AddLog(CEC_LOG_DEBUG, strLog);
+    m_powerStatus = powerStatus;
+  }
 }
 
 void CCECBusDevice::SetVendorId(const cec_datapacket &data)
@@ -188,7 +201,7 @@ const cec_vendor &CCECBusDevice::GetVendor(void)
   {
     AddLog(CEC_LOG_NOTICE, "<< requesting vendor ID");
     cec_command command;
-    cec_command::format(command, GetMyLogicalAddress(), GetLogicalAddress(), CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
+    cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
     CLockObject lock(&m_mutex);
 
     if (m_processor->Transmit(command))
@@ -208,9 +221,9 @@ void CCECBusDevice::PollVendorId(void)
     m_iLastActive = GetTimeMs();
 
     cec_command command;
-    cec_command::format(command, GetMyLogicalAddress(), GetLogicalAddress(), CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
-    command.ack_timeout = 0;
-    m_processor->Transmit(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);
   }
 }
 
@@ -219,7 +232,7 @@ void CCECBusDevice::SetPhysicalAddress(uint16_t iNewAddress, uint16_t iOldAddres
   if (iNewAddress > 0)
   {
     CStdString strLog;
-    strLog.Format(">> %i changed physical address from %04x to %04x", GetLogicalAddress(), m_iPhysicalAddress, iNewAddress);
+    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;
@@ -260,113 +273,114 @@ bool CCECBusDevice::SetOSDString(cec_display_control duration, const char *strMe
   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++)
+  unsigned int iLen = strlen(strMessage);
+  if (iLen > 13) iLen = 13;
+
+  for (unsigned int iPtr = 0; iPtr < iLen; iPtr++)
     command.parameters.push_back(strMessage[iPtr]);
 
   return m_processor->Transmit(command);
 }
 
-bool CCECBusDevice::ReportCECVersion(void)
+bool CCECBusDevice::TransmitCECVersion(cec_logical_address dest)
 {
   AddLog(CEC_LOG_NOTICE, "<< reporting CEC version as 1.3a");
 
   cec_command command;
-  cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_CEC_VERSION);
-  command.parameters.push_back(CEC_VERSION_1_3A);
+  cec_command::format(command, m_iLogicalAddress, dest, CEC_OPCODE_CEC_VERSION);
+  command.parameters.push_back(m_cecVersion);
 
   return m_processor->Transmit(command);
 }
 
-bool CCECBusDevice::ReportDeckStatus(void)
+bool CCECBusDevice::TransmitDeckStatus(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(m_iLogicalAddress, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
+  m_processor->TransmitAbort(dest, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
   return false;
 }
 
-bool CCECBusDevice::ReportMenuState(bool bActive /* = true */)
+bool CCECBusDevice::TransmitMenuState(cec_logical_address dest)
 {
-  if (bActive)
+  if (m_bMenuActive)
     AddLog(CEC_LOG_NOTICE, "<< reporting menu state as active");
   else
     AddLog(CEC_LOG_NOTICE, "<< reporting menu state as inactive");
 
   cec_command command;
-  cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, 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_MENU_STATUS);
+  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(void)
+bool CCECBusDevice::TransmitOSDName(cec_logical_address dest)
 {
-  const char *osdname = m_processor->GetDeviceName().c_str();
   CStdString strLog;
-  strLog.Format("<< reporting OSD name as %s", osdname);
+  strLog.Format("<< reporting OSD name as %s", m_strDeviceName.c_str());
   AddLog(CEC_LOG_NOTICE, strLog.c_str());
 
   cec_command command;
-  cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_SET_OSD_NAME);
-  for (unsigned int iPtr = 0; iPtr < strlen(osdname); iPtr++)
-    command.parameters.push_back(osdname[iPtr]);
+  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));
 
   return m_processor->Transmit(command);
 }
 
-bool CCECBusDevice::ReportPowerState(bool bOn /* = true */)
+bool CCECBusDevice::TransmitPowerState(cec_logical_address dest)
 {
-  if (bOn)
-    AddLog(CEC_LOG_NOTICE, "<< reporting \"On\" power status");
-  else
-    AddLog(CEC_LOG_NOTICE, "<< reporting \"Off\" power status");
+  CStdString strLog;
+  strLog.Format("<< reporting power status '%d'", m_powerStatus);
+  AddLog(CEC_LOG_NOTICE, strLog);
 
   cec_command command;
-  cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_REPORT_POWER_STATUS);
-  command.parameters.push_back(bOn ? (uint8_t) CEC_POWER_STATUS_ON : (uint8_t) CEC_POWER_STATUS_STANDBY);
+  cec_command::format(command, m_iLogicalAddress, dest, CEC_OPCODE_REPORT_POWER_STATUS);
+  command.parameters.push_back((uint8_t) m_powerStatus);
 
   return m_processor->Transmit(command);
 }
 
-bool CCECBusDevice::ReportVendorID(void)
+bool CCECBusDevice::TransmitVendorID(cec_logical_address dest)
 {
   AddLog(CEC_LOG_NOTICE, "<< vendor ID requested, feature abort");
-  m_processor->TransmitAbort(m_iLogicalAddress, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
+  m_processor->TransmitAbort(dest, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
   return false;
 }
 
-bool CCECBusDevice::BroadcastActiveView(void)
+bool CCECBusDevice::TransmitActiveView(void)
 {
   AddLog(CEC_LOG_DEBUG, "<< setting active view");
 
   cec_command command;
-  cec_command::format(command, GetMyLogicalAddress(), CECDEVICE_BROADCAST, CEC_OPCODE_ACTIVE_SOURCE);
+  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::BroadcastInactiveView(void)
+bool CCECBusDevice::TransmitInactiveView(void)
 {
   AddLog(CEC_LOG_DEBUG, "<< setting inactive view");
 
   cec_command command;
-  cec_command::format(command, GetMyLogicalAddress(), CECDEVICE_BROADCAST, CEC_OPCODE_INACTIVE_SOURCE);
+  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::BroadcastPhysicalAddress(void)
+bool CCECBusDevice::TransmitPhysicalAddress(void)
 {
   CStdString strLog;
   strLog.Format("<< reporting physical address as %04x", m_iPhysicalAddress);
   AddLog(CEC_LOG_NOTICE, strLog.c_str());
 
   cec_command command;
-  cec_command::format(command, GetMyLogicalAddress(), CECDEVICE_BROADCAST, CEC_OPCODE_REPORT_PHYSICAL_ADDRESS);
+  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));
@@ -374,12 +388,12 @@ bool CCECBusDevice::BroadcastPhysicalAddress(void)
   return m_processor->Transmit(command);
 }
 
-bool CCECBusDevice::BroadcastActiveSource(void)
+bool CCECBusDevice::TransmitActiveSource(void)
 {
   AddLog(CEC_LOG_NOTICE, "<< broadcasting active source");
 
   cec_command command;
-  cec_command::format(command, GetMyLogicalAddress(), CECDEVICE_BROADCAST, CEC_OPCODE_ACTIVE_SOURCE);
+  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));
 
@@ -430,3 +444,23 @@ cec_power_status CCECBusDevice::GetPowerStatus(bool bRefresh /* = true */)
 
   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("<< 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);
+
+  bReturn = m_processor->Transmit(command);
+  AddLog(CEC_LOG_DEBUG, bReturn ? ">> POLL sent" : ">> POLL not sent");
+  return bReturn;
+}
libcec Piment Noir Debian package repository