cec: added poweroff devices parameter to the config (instead of a boolean parameter...

[deb_libcec.git] / src / lib / CECProcessor.cpp

diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp
index ef2bbd10c4a0a7724b64d30223ee72d846a7a877..3bc4e7372767cbbdc3f632bc1b9c4a313ea0a46d 100644 (file)
--- a/src/lib/CECProcessor.cpp
+++ b/src/lib/CECProcessor.cpp
@@ -228,7 +228,7 @@ bool CCECProcessor::Initialise(void)
   else if (m_configuration.iPhysicalAddress == 0 && (bReturn = SetHDMIPort(m_configuration.baseDevice, m_configuration.iHDMIPort, true)) == false)
     CLibCEC::AddLog(CEC_LOG_ERROR, "unable to set HDMI port %d on %s (%x)", m_configuration.iHDMIPort, ToString(m_configuration.baseDevice), (uint8_t)m_configuration.baseDevice);
 
-  WakeDevices();
+  PowerOnDevices();
 
   SetInitialised(bReturn);
   CLibCEC::ConfigurationChanged(m_configuration);
@@ -236,15 +236,6 @@ bool CCECProcessor::Initialise(void)
   return bReturn;
 }
 
-void CCECProcessor::WakeDevices(void)
-{
-  for (uint8_t iPtr = 0; iPtr <= 0xF; iPtr++)
-  {
-    if (m_configuration.wakeDevices[iPtr])
-      m_busDevices[iPtr]->PowerOn();
-  }
-}
-
 bool CCECProcessor::Start(const char *strPort, uint16_t iBaudRate /* = 38400 */, uint32_t iTimeoutMs /* = 10000 */)
 {
   bool bReturn(false);
@@ -953,6 +944,38 @@ bool CCECProcessor::TransmitKeyRelease(cec_logical_address iDestination, bool bW
   return m_busDevices[iDestination]->TransmitKeyRelease(bWait);
 }
 
+bool CCECProcessor::StandbyDevices(cec_logical_address address /* = CECDEVICE_BROADCAST */)
+{
+  if (address == CECDEVICE_BROADCAST && m_configuration.clientVersion >= CEC_CLIENT_VERSION_1_5_0)
+  {
+    bool bReturn(true);
+    for (uint8_t iPtr = 0; iPtr <= 0xF; iPtr++)
+    {
+      if (m_configuration.powerOffDevices[iPtr])
+        bReturn &= m_busDevices[iPtr]->Standby();
+    }
+    return bReturn;
+  }
+
+  return m_busDevices[address]->Standby();
+}
+
+bool CCECProcessor::PowerOnDevices(cec_logical_address address /* = CECDEVICE_BROADCAST */)
+{
+  if (address == CECDEVICE_BROADCAST && m_configuration.clientVersion >= CEC_CLIENT_VERSION_1_5_0)
+  {
+    bool bReturn(true);
+    for (uint8_t iPtr = 0; iPtr <= 0xF; iPtr++)
+    {
+      if (m_configuration.powerOffDevices[iPtr])
+        bReturn &= m_busDevices[iPtr]->PowerOn();
+    }
+    return bReturn;
+  }
+
+  return m_busDevices[address]->PowerOn();
+}
+
 const char *CCECProcessor::ToString(const cec_device_type type)
 {
   switch (type)
@@ -1426,13 +1449,12 @@ bool CCECProcessor::SetConfiguration(const libcec_configuration *configuration)
   {
     m_configuration.wakeDevices = configuration->wakeDevices;
     if (!bNeedsReinit && IsRunning())
-      WakeDevices();
+      PowerOnDevices();
   }
 
   // just copy these
   m_configuration.bGetSettingsFromROM  = configuration->bGetSettingsFromROM;
-  m_configuration.bPowerOnStartup      = configuration->bPowerOnStartup;
-  m_configuration.bPowerOffShutdown    = configuration->bPowerOffShutdown;
+  m_configuration.powerOffDevices      = configuration->powerOffDevices;
   m_configuration.bPowerOffScreensaver = configuration->bPowerOffScreensaver;
   m_configuration.bPowerOffOnStandby   = configuration->bPowerOffOnStandby;
 
@@ -1464,8 +1486,7 @@ bool CCECProcessor::GetCurrentConfiguration(libcec_configuration *configuration)
   configuration->tvVendor             = m_configuration.tvVendor;
   configuration->wakeDevices          = m_configuration.wakeDevices;
   configuration->bGetSettingsFromROM  = m_configuration.bGetSettingsFromROM;
-  configuration->bPowerOnStartup      = m_configuration.bPowerOnStartup;
-  configuration->bPowerOffShutdown    = m_configuration.bPowerOffShutdown;
+  configuration->powerOffDevices      = m_configuration.powerOffDevices;
   configuration->bPowerOffScreensaver = m_configuration.bPowerOffScreensaver;
   configuration->bPowerOffOnStandby   = m_configuration.bPowerOffOnStandby;