cec: opcode 0x80 means the stream path changed, not the physical address

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

diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp
index 5eed4a888f650802c3238d47c5a391275617e242..f03f09bef20d7077282fc97df821e04a48b26098 100644 (file)
--- a/src/lib/CECProcessor.cpp
+++ b/src/lib/CECProcessor.cpp
@@ -143,7 +143,7 @@ bool CCECProcessor::TryLogicalAddress(cec_logical_address address, const char *s
   AddLog(CEC_LOG_DEBUG, strLog);
 
   SetAckMask(0x1 << address);
-  if (!m_busDevices[address]->PollDevice(address))
+  if (!m_busDevices[address]->TransmitPoll(address))
   {
     strLog.Format("using logical address '%s'", strLabel);
     AddLog(CEC_LOG_NOTICE, strLog);
@@ -151,10 +151,11 @@ bool CCECProcessor::TryLogicalAddress(cec_logical_address address, const char *s
     /* only set our OSD name for the primary device */
     if (m_logicalAddresses.empty())
       m_busDevices[address]->m_strDeviceName = m_strDeviceName;
+    m_busDevices[address]->m_powerStatus = CEC_POWER_STATUS_ON;
     m_logicalAddresses.set(address);
 
     // TODO
-    m_busDevices[address]->SetPhysicalAddress(CEC_DEFAULT_PHYSICAL_ADDRESS + iIndex);
+    m_busDevices[address]->SetPhysicalAddress(CEC_DEFAULT_PHYSICAL_ADDRESS + (iIndex * 0x100));
 
     return true;
   }
@@ -286,7 +287,7 @@ bool CCECProcessor::SetActiveView(void)
     return false;
 
   if (!m_logicalAddresses.empty() && m_busDevices[m_logicalAddresses.primary])
-    return m_busDevices[m_logicalAddresses.primary]->BroadcastActiveView();
+    return m_busDevices[m_logicalAddresses.primary]->TransmitActiveView();
   return false;
 }
 
@@ -296,7 +297,7 @@ bool CCECProcessor::SetInactiveView(void)
     return false;
 
   if (!m_logicalAddresses.empty() && m_busDevices[m_logicalAddresses.primary])
-    return m_busDevices[m_logicalAddresses.primary]->BroadcastInactiveView();
+    return m_busDevices[m_logicalAddresses.primary]->TransmitInactiveView();
   return false;
 }
 
@@ -332,7 +333,7 @@ bool CCECProcessor::SetPhysicalAddress(uint16_t iPhysicalAddress)
   if (!m_logicalAddresses.empty() && m_busDevices[m_logicalAddresses.primary])
   {
     m_busDevices[m_logicalAddresses.primary]->SetPhysicalAddress(iPhysicalAddress);
-    return m_busDevices[m_logicalAddresses.primary]->BroadcastActiveView();
+    return m_busDevices[m_logicalAddresses.primary]->TransmitActiveView();
   }
   return false;
 }
@@ -353,7 +354,7 @@ bool CCECProcessor::SwitchMonitoring(bool bEnable)
 bool CCECProcessor::PollDevice(cec_logical_address iAddress)
 {
   if (iAddress != CECDEVICE_UNKNOWN && m_busDevices[iAddress])
-    return m_busDevices[iAddress]->PollDevice();
+    return m_busDevices[m_logicalAddresses.primary]->TransmitPoll(iAddress);
   return false;
 }