cec: don't request updates statusses unless needed

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

diff --git a/src/lib/devices/CECBusDevice.cpp b/src/lib/devices/CECBusDevice.cpp
index 20fe43b33179b2bf9fd23d3a669ff9a1c50df339..3d8feaf4379ec54e08dd160fe7c5e0362bbc9d81 100644 (file)
--- a/src/lib/devices/CECBusDevice.cpp
+++ b/src/lib/devices/CECBusDevice.cpp
@@ -144,6 +144,20 @@ bool CCECBusDevice::Standby(void)
 //@{
 cec_version CCECBusDevice::GetCecVersion(void)
 {
+  CLockObject lock(&m_mutex);
+  if (m_cecVersion == CEC_VERSION_UNKNOWN)
+  {
+    lock.Leave();
+    RequestCecVersion();
+    lock.Lock();
+  }
+
+  return m_cecVersion;
+}
+
+bool CCECBusDevice::RequestCecVersion(void)
+{
+  bool bReturn(false);
   if (!MyLogicalAddressContains(m_iLogicalAddress))
   {
     CStdString strLog;
@@ -153,11 +167,9 @@ cec_version CCECBusDevice::GetCecVersion(void)
     cec_command::Format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GET_CEC_VERSION);
     CLockObject lock(&m_transmitMutex);
     if (m_processor->Transmit(command))
-      m_condition.Wait(&m_transmitMutex, 1000);
+      bReturn = m_condition.Wait(&m_transmitMutex, 1000);
   }
-
-  CLockObject lock(&m_mutex);
-  return m_cecVersion;
+  return bReturn;
 }
 
 const char* CCECBusDevice::GetLogicalAddressName(void) const
@@ -167,6 +179,19 @@ const char* CCECBusDevice::GetLogicalAddressName(void) const
 
 cec_menu_language &CCECBusDevice::GetMenuLanguage(void)
 {
+  CLockObject lock(&m_mutex);
+  if (!strcmp(m_menuLanguage.language, "???"))
+  {
+    lock.Leave();
+    RequestMenuLanguage();
+    lock.Lock();
+  }
+  return m_menuLanguage;
+}
+
+bool CCECBusDevice::RequestMenuLanguage(void)
+{
+  bool bReturn(false);
   if (!MyLogicalAddressContains(m_iLogicalAddress))
   {
     CStdString strLog;
@@ -176,11 +201,9 @@ cec_menu_language &CCECBusDevice::GetMenuLanguage(void)
     cec_command::Format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GET_MENU_LANGUAGE);
     CLockObject lock(&m_transmitMutex);
     if (m_processor->Transmit(command))
-      m_condition.Wait(&m_transmitMutex, 1000);
+      bReturn = m_condition.Wait(&m_transmitMutex, 1000);
   }
-
-  CLockObject lock(&m_mutex);
-  return m_menuLanguage;
+  return bReturn;
 }
 
 cec_logical_address CCECBusDevice::GetMyLogicalAddress(void) const
@@ -195,6 +218,19 @@ uint16_t CCECBusDevice::GetMyPhysicalAddress(void) const
 
 cec_power_status CCECBusDevice::GetPowerStatus(void)
 {
+  CLockObject lock(&m_mutex);
+  if (m_powerStatus == CEC_POWER_STATUS_UNKNOWN)
+  {
+    lock.Leave();
+    RequestPowerStatus();
+    lock.Lock();
+  }
+  return m_powerStatus;
+}
+
+bool CCECBusDevice::RequestPowerStatus(void)
+{
+  bool bReturn(false);
   if (!MyLogicalAddressContains(m_iLogicalAddress))
   {
     CStdString strLog;
@@ -204,15 +240,26 @@ cec_power_status CCECBusDevice::GetPowerStatus(void)
     cec_command::Format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GIVE_DEVICE_POWER_STATUS);
     CLockObject lock(&m_transmitMutex);
     if (m_processor->Transmit(command))
-      m_condition.Wait(&m_transmitMutex, 1000);
+      bReturn = m_condition.Wait(&m_transmitMutex, 1000);
   }
+  return bReturn;
+}
 
+cec_vendor_id CCECBusDevice::GetVendorId(void)
+{
   CLockObject lock(&m_mutex);
-  return m_powerStatus;
+  if (m_vendor == CEC_VENDOR_UNKNOWN)
+  {
+    lock.Leave();
+    RequestVendorId();
+    lock.Lock();
+  }
+  return m_vendor;
 }
 
-cec_vendor_id CCECBusDevice::GetVendorId(void)
+bool CCECBusDevice::RequestVendorId(void)
 {
+  bool bReturn(false);
   if (!MyLogicalAddressContains(m_iLogicalAddress))
   {
     CStdString strLog;
@@ -220,20 +267,17 @@ cec_vendor_id CCECBusDevice::GetVendorId(void)
     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);
 
+    CLockObject lock(&m_transmitMutex);
     if (m_processor->Transmit(command))
-      m_condition.Wait(&m_transmitMutex, 1000);
+      bReturn = m_condition.Wait(&m_transmitMutex, 1000);
   }
-
-  CLockObject lock(&m_mutex);
-  return m_vendor;
+  return bReturn;
 }
 
 const char *CCECBusDevice::GetVendorName(void)
 {
-  CLockObject lock(&m_mutex);
-  return ToString(m_vendor);
+  return ToString(GetVendorId());
 }
 
 bool CCECBusDevice::MyLogicalAddressContains(cec_logical_address address) const
@@ -322,6 +366,62 @@ void CCECBusDevice::SetActiveDevice(void)
   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_mutex);
+  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)
 {
   CLockObject lock(&m_mutex);