cec: mark the active source as active and other devices as inactive. removed duplicat...

[deb_libcec.git] / src / lib / devices / CECBusDevice.cpp

diff --git a/src/lib/devices/CECBusDevice.cpp b/src/lib/devices/CECBusDevice.cpp
index c2595c3927aff0a07619d8921c9d191ebd6b5a86..49ca7db7ce64592db298735d361d040f08b23149 100644 (file)
--- a/src/lib/devices/CECBusDevice.cpp
+++ b/src/lib/devices/CECBusDevice.cpp
@@ -47,7 +47,9 @@ CCECBusDevice::CCECBusDevice(CCECProcessor *processor, cec_logical_address iLogi
   m_powerStatus(CEC_POWER_STATUS_UNKNOWN),
   m_processor(processor),
   m_bMenuActive(true),
+  m_bActiveSource(false),
   m_iVendorClass(CEC_VENDOR_UNKNOWN),
+  m_iLastCommandSent(0),
   m_iLastActive(0),
   m_cecVersion(CEC_VERSION_UNKNOWN)
 {
@@ -60,7 +62,7 @@ CCECBusDevice::CCECBusDevice(CCECProcessor *processor, cec_logical_address iLogi
 
   m_vendor.vendor = CEC_VENDOR_UNKNOWN;
   m_type          = CEC_DEVICE_TYPE_RESERVED;
-  m_strDeviceName = "Unknown";
+  m_strDeviceName = CCECCommandHandler::ToString(m_iLogicalAddress);
 }
 
 CCECBusDevice::~CCECBusDevice(void)
@@ -88,13 +90,13 @@ 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 &&
+      GetTimeMs() - m_iLastCommandSent > 5000 &&
       !m_processor->IsMonitoring())
   {
     CStdString strLog;
-    strLog.Format("<< requesting vendor ID of device %x", m_iLogicalAddress);
+    strLog.Format("<< requesting vendor ID of '%s' (%X)", GetLogicalAddressName(), m_iLogicalAddress);
     AddLog(CEC_LOG_NOTICE, strLog);
-    m_iLastActive = GetTimeMs();
+    m_iLastCommandSent = GetTimeMs();
 
     cec_command command;
     cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
@@ -105,20 +107,29 @@ void CCECBusDevice::PollVendorId(void)
 
 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_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());
 
-  cec_command command;
-  cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_IMAGE_VIEW_ON);
+    SetPowerStatus(CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON);
 
-  return m_processor->Transmit(command);
+    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 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;
@@ -136,7 +147,7 @@ cec_version CCECBusDevice::GetCecVersion(void)
     if (!MyLogicalAddressContains(m_iLogicalAddress))
     {
       CStdString strLog;
-      strLog.Format("<< requesting CEC version of device %x", m_iLogicalAddress);
+      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);
@@ -149,6 +160,11 @@ cec_version CCECBusDevice::GetCecVersion(void)
   return m_cecVersion;
 }
 
+const char* CCECBusDevice::GetLogicalAddressName(void) const
+{
+  return CCECCommandHandler::ToString(m_iLogicalAddress);
+}
+
 cec_menu_language &CCECBusDevice::GetMenuLanguage(void)
 {
   if (!strcmp(m_menuLanguage.language, "???"))
@@ -156,7 +172,7 @@ cec_menu_language &CCECBusDevice::GetMenuLanguage(void)
     if (!MyLogicalAddressContains(m_iLogicalAddress))
     {
       CStdString strLog;
-      strLog.Format("<< requesting menu language of device %x", m_iLogicalAddress);
+      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);
@@ -186,7 +202,7 @@ cec_power_status CCECBusDevice::GetPowerStatus(void)
     if (!MyLogicalAddressContains(m_iLogicalAddress))
     {
       CStdString strLog;
-      strLog.Format("<< requesting power status of device %x", m_iLogicalAddress);
+      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);
@@ -206,7 +222,7 @@ const cec_vendor &CCECBusDevice::GetVendor(void)
     if (!MyLogicalAddressContains(m_iLogicalAddress))
     {
       CStdString strLog;
-      strLog.Format("<< requesting vendor ID of device %x", m_iLogicalAddress);
+      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);
@@ -237,19 +253,19 @@ void CCECBusDevice::SetCecVersion(const cec_version newVersion)
   switch (newVersion)
   {
   case CEC_VERSION_1_2:
-    strLog.Format("device %d: CEC version 1.2", m_iLogicalAddress);
+    strLog.Format("%s (%X): CEC version 1.2", GetLogicalAddressName(), m_iLogicalAddress);
     break;
   case CEC_VERSION_1_2A:
-    strLog.Format("device %d: CEC version 1.2a", m_iLogicalAddress);
+    strLog.Format("%s (%X): CEC version 1.2a", GetLogicalAddressName(), m_iLogicalAddress);
     break;
   case CEC_VERSION_1_3:
-    strLog.Format("device %d: CEC version 1.3", m_iLogicalAddress);
+    strLog.Format("%s (%X): CEC version 1.3", GetLogicalAddressName(), m_iLogicalAddress);
     break;
   case CEC_VERSION_1_3A:
-    strLog.Format("device %d: CEC version 1.3a", m_iLogicalAddress);
+    strLog.Format("%s (%X): CEC version 1.3a", GetLogicalAddressName(), m_iLogicalAddress);
     break;
   default:
-    strLog.Format("device %d: unknown CEC version", m_iLogicalAddress);
+    strLog.Format("%s (%X): unknown CEC version", GetLogicalAddressName(), m_iLogicalAddress);
     m_cecVersion = CEC_VERSION_UNKNOWN;
     break;
   }
@@ -261,7 +277,7 @@ 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);
+    strLog.Format(">> %s (%X): menu language set to '%s'", GetLogicalAddressName(), m_iLogicalAddress, language.language);
     m_processor->AddLog(CEC_LOG_DEBUG, strLog);
     m_menuLanguage = language;
   }
@@ -272,7 +288,7 @@ void CCECBusDevice::SetPhysicalAddress(uint16_t iNewAddress)
   if (iNewAddress > 0)
   {
     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;
@@ -284,10 +300,13 @@ void CCECBusDevice::SetStreamPath(uint16_t iNewAddress, uint16_t iOldAddress /*
   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, iNewAddress);
     AddLog(CEC_LOG_DEBUG, strLog.c_str());
 
     m_iStreamPath = iNewAddress;
+
+    if (iNewAddress > 0)
+      SetPowerStatus(CEC_POWER_STATUS_ON);
   }
 }
 
@@ -296,7 +315,7 @@ void CCECBusDevice::SetPowerStatus(const cec_power_status powerStatus)
   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 %2x to %2x", GetLogicalAddressName(), m_iLogicalAddress, m_powerStatus, powerStatus);
     m_processor->AddLog(CEC_LOG_DEBUG, strLog);
     m_powerStatus = powerStatus;
   }
@@ -340,7 +359,7 @@ 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) class = %2x", GetLogicalAddressName(), m_iLogicalAddress, GetVendorName(), GetVendorId(), GetVendorClass());
   m_processor->AddLog(CEC_LOG_DEBUG, strLog.c_str());
 }
 //@}
@@ -349,36 +368,33 @@ void CCECBusDevice::SetVendorId(uint64_t iVendorId, uint8_t iVendorClass /* = 0
 //@{
 bool CCECBusDevice::TransmitActiveSource(void)
 {
-  CStdString strLog;
-  strLog.Format("<< %x -> broadcast: active source (%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((uint8_t) ((m_iPhysicalAddress >> 8) & 0xFF));
-  command.parameters.push_back((uint8_t) (m_iPhysicalAddress & 0xFF));
-
-  return m_processor->Transmit(command);
-}
+  if (m_bActiveSource)
+  {
+    CStdString strLog;
+    strLog.Format("<< %s (%X) -> broadcast (F): active source (%4x)", GetLogicalAddressName(), m_iLogicalAddress, m_iPhysicalAddress);
+    AddLog(CEC_LOG_NOTICE, strLog);
 
-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((uint8_t) ((m_iPhysicalAddress >> 8) & 0xFF));
+    command.parameters.push_back((uint8_t) (m_iPhysicalAddress & 0xFF));
 
-  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);
+  }
+  else
+  {
+    CStdString strLog;
+    strLog.Format("<< %s (%X) is not the active source", GetLogicalAddressName(), m_iLogicalAddress);
+    AddLog(CEC_LOG_DEBUG, strLog);
+  }
 
-  return m_processor->Transmit(command);
+  return false;
 }
 
 bool CCECBusDevice::TransmitCECVersion(cec_logical_address dest)
 {
   CStdString strLog;
-  strLog.Format("<< %x -> %x: cec version ", m_iLogicalAddress, dest);
+  strLog.Format("<< %s (%X) -> %s (%X): cec version ", GetLogicalAddressName(), m_iLogicalAddress, CCECCommandHandler::ToString(dest), dest);
   switch (m_cecVersion)
   {
   case CEC_VERSION_1_2:
@@ -406,21 +422,10 @@ bool CCECBusDevice::TransmitCECVersion(cec_logical_address dest)
   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)
 {
   CStdString strLog;
-  strLog.Format("<< %x -> broadcast: inactive view", m_iLogicalAddress);
+  strLog.Format("<< %s (%X) -> broadcast (F): inactive view", GetLogicalAddressName(), m_iLogicalAddress);
   AddLog(CEC_LOG_NOTICE, strLog);
 
   cec_command command;
@@ -434,7 +439,7 @@ bool CCECBusDevice::TransmitInactiveView(void)
 bool CCECBusDevice::TransmitMenuState(cec_logical_address dest)
 {
   CStdString strLog;
-  strLog.Format("<< %x -> %x: ", m_iLogicalAddress, dest);
+  strLog.Format("<< %s (%X) -> %s (%X): ", GetLogicalAddressName(), m_iLogicalAddress, CCECCommandHandler::ToString(dest), dest);
   if (m_bMenuActive)
     strLog.append("menu active");
   else
@@ -451,7 +456,7 @@ bool CCECBusDevice::TransmitMenuState(cec_logical_address dest)
 bool CCECBusDevice::TransmitOSDName(cec_logical_address dest)
 {
   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, CCECCommandHandler::ToString(dest), dest, m_strDeviceName.c_str());
   AddLog(CEC_LOG_NOTICE, strLog.c_str());
 
   cec_command command;
@@ -465,7 +470,7 @@ bool CCECBusDevice::TransmitOSDName(cec_logical_address dest)
 bool CCECBusDevice::TransmitOSDString(cec_logical_address dest, cec_display_control duration, const char *strMessage)
 {
   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, CCECCommandHandler::ToString(dest), dest, strMessage);
   AddLog(CEC_LOG_NOTICE, strLog.c_str());
 
   cec_command command;
@@ -484,7 +489,7 @@ bool CCECBusDevice::TransmitOSDString(cec_logical_address dest, cec_display_cont
 bool CCECBusDevice::TransmitPhysicalAddress(void)
 {
   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;
@@ -504,7 +509,7 @@ bool CCECBusDevice::TransmitPoll(cec_logical_address dest)
     dest = m_iLogicalAddress;
 
   CStdString strLog;
-  strLog.Format("<< %x -> %x: POLL", m_iLogicalAddress, dest);
+  strLog.Format("<< %s (%X) -> %s (%X): POLL", GetLogicalAddressName(), m_iLogicalAddress, CCECCommandHandler::ToString(dest), dest);
   AddLog(CEC_LOG_NOTICE, strLog.c_str());
 
   cec_command command;
@@ -519,7 +524,7 @@ bool CCECBusDevice::TransmitPoll(cec_logical_address dest)
 bool CCECBusDevice::TransmitPowerState(cec_logical_address dest)
 {
   CStdString strLog;
-  strLog.Format("<< %x -> %x: ", m_iLogicalAddress, dest);
+  strLog.Format("<< %s (%X) -> %s (%X): ", GetLogicalAddressName(), m_iLogicalAddress, CCECCommandHandler::ToString(dest), dest);
 
   switch (m_powerStatus)
   {
@@ -554,7 +559,7 @@ bool CCECBusDevice::TransmitPowerState(cec_logical_address dest)
 bool CCECBusDevice::TransmitVendorID(cec_logical_address dest)
 {
   CStdString strLog;
-  strLog.Format("<< %x -> %x: vendor id feature abort", m_iLogicalAddress, dest);
+  strLog.Format("<< %s (%X) -> %s (%X): vendor id feature abort", GetLogicalAddressName(), m_iLogicalAddress, CCECCommandHandler::ToString(dest), dest);
   AddLog(CEC_LOG_NOTICE, strLog);
 
   m_processor->TransmitAbort(dest, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);