cec: don't send 'image view on' to LG unless needed, or the tv will get caught in...

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

diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp
index 1e655507e814ead3c7c0288198545dc7b6325270..230f2ab0388f4e937b97a27f10a33f92991ee16b 100644 (file)
--- a/src/lib/CECProcessor.cpp
+++ b/src/lib/CECProcessor.cpp
@@ -461,7 +461,8 @@ bool CCECProcessor::SetActiveSource(cec_device_type type /* = CEC_DEVICE_TYPE_RE
   m_busDevices[addr]->SetActiveSource();
   if (m_busDevices[addr]->GetPhysicalAddress(false) != 0xFFFF)
   {
-    bReturn = m_busDevices[addr]->TransmitActiveSource();
+    bReturn = m_busDevices[addr]->TransmitImageViewOn() &&
+        m_busDevices[addr]->TransmitActiveSource();
 
     if (bReturn)
     {
@@ -1375,7 +1376,17 @@ bool CCECProcessor::GetCurrentConfiguration(libcec_configuration *configuration)
   configuration->iPhysicalAddress = m_iPhysicalAddress;
   configuration->iHDMIPort = m_iHDMIPort;
   configuration->baseDevice = m_iBaseDevice;
-  snprintf(configuration->strDeviceName, 13, m_strDeviceName.c_str());
+  snprintf(configuration->strDeviceName, 13, "%s", m_strDeviceName.c_str());
   configuration->deviceTypes = m_types;
   return true;
 }
+
+bool CCECProcessor::CanPersistConfiguration(void)
+{
+  return m_communication->GetFirmwareVersion() >= 2;
+}
+
+bool CCECProcessor::PersistConfiguration(libcec_configuration *configuration)
+{
+  return m_communication->PersistConfiguration(configuration);
+}