X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FCECProcessor.cpp;h=782b611647520f6d8f04da001c28e0c704557d1d;hb=868dc71fc0084c08a6f3d19888a7f4f855add3f4;hp=bdcb4d3e816deadbde7385d1dbab0c91e40ddbde;hpb=91bea17434cd0cec8c6c7f2a53cb8cdd07e4c446;p=deb_libcec.git

diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp
index bdcb4d3..782b611 100644
--- a/src/lib/CECProcessor.cpp
+++ b/src/lib/CECProcessor.cpp
@@ -54,10 +54,10 @@ CCECProcessor::CCECProcessor(CLibCEC *controller, CAdapterCommunication *serComm
     m_controller(controller),
     m_bMonitor(false)
 {
-  m_logicalAddresses.clear();
-  m_logicalAddresses.set(iLogicalAddress);
+  m_logicalAddresses.Clear();
+  m_logicalAddresses.Set(iLogicalAddress);
   m_types.clear();
-  for (int iPtr = 0; iPtr < 16; iPtr++)
+  for (int iPtr = 0; iPtr <= 16; iPtr++)
     m_busDevices[iPtr] = new CCECBusDevice(this, (cec_logical_address) iPtr, iPtr == iLogicalAddress ? iPhysicalAddress : 0);
 }
 
@@ -69,7 +69,7 @@ CCECProcessor::CCECProcessor(CLibCEC *controller, CAdapterCommunication *serComm
     m_controller(controller),
     m_bMonitor(false)
 {
-  m_logicalAddresses.clear();
+  m_logicalAddresses.Clear();
   for (int iPtr = 0; iPtr < 16; iPtr++)
   {
     switch(iPtr)
@@ -139,27 +139,15 @@ bool CCECProcessor::Start(void)
 
 bool CCECProcessor::TryLogicalAddress(cec_logical_address address, unsigned int iIndex)
 {
-  const char *strLabel = CCECCommandHandler::ToString(address);
-  CStdString strLog;
-  strLog.Format("trying logical address '%s'", strLabel);
-  AddLog(CEC_LOG_DEBUG, strLog);
-
-  SetAckMask(0x1 << address);
-  if (!m_busDevices[address]->TransmitPoll(address))
+  if (m_busDevices[address]->TryLogicalAddress())
   {
-    strLog.Format("using logical address '%s'", strLabel);
-    AddLog(CEC_LOG_NOTICE, strLog);
-
     /* only set our OSD name and active source for the primary device */
-    if (m_logicalAddresses.empty())
+    if (m_logicalAddresses.IsEmpty())
     {
       m_busDevices[address]->m_strDeviceName = m_strDeviceName;
       m_busDevices[address]->m_bActiveSource = true;
     }
-    m_busDevices[address]->m_powerStatus = CEC_POWER_STATUS_STANDBY;
-    m_busDevices[address]->m_cecVersion =  CEC_VERSION_1_3A;
-
-    m_logicalAddresses.set(address);
+    m_logicalAddresses.Set(address);
 
     // TODO
     m_busDevices[address]->SetPhysicalAddress((uint16_t)CEC_DEFAULT_PHYSICAL_ADDRESS + ((uint16_t)iIndex * 0x100));
@@ -167,8 +155,6 @@ bool CCECProcessor::TryLogicalAddress(cec_logical_address address, unsigned int
     return true;
   }
 
-  strLog.Format("logical address '%s' already taken", strLabel);
-  AddLog(CEC_LOG_DEBUG, strLog);
   return false;
 }
 
@@ -206,7 +192,7 @@ bool CCECProcessor::FindLogicalAddressAudioSystem(unsigned int iIndex)
 bool CCECProcessor::FindLogicalAddresses(void)
 {
   bool bReturn(true);
-  m_logicalAddresses.clear();
+  m_logicalAddresses.Clear();
   CStdString strLog;
 
   for (unsigned int iPtr = 0; iPtr < 5; iPtr++)
@@ -237,7 +223,7 @@ void *CCECProcessor::Process(void)
   CCECAdapterMessage    msg;
 
   {
-    if (m_logicalAddresses.empty() && !FindLogicalAddresses())
+    if (m_logicalAddresses.IsEmpty() && !FindLogicalAddresses())
     {
       CLockObject lock(&m_mutex);
       m_controller->AddLog(CEC_LOG_ERROR, "could not detect our logical addressed");
@@ -245,7 +231,7 @@ void *CCECProcessor::Process(void)
       return NULL;
     }
 
-    SetAckMask(m_logicalAddresses.ackmask());
+    SetAckMask(m_logicalAddresses.AckMask());
 
     {
       CLockObject lock(&m_mutex);
@@ -257,7 +243,7 @@ void *CCECProcessor::Process(void)
 
   while (!IsStopped())
   {
-    command.clear();
+    command.Clear();
     msg.clear();
 
     {
@@ -312,12 +298,13 @@ bool CCECProcessor::SetActiveSource(cec_device_type type /* = CEC_DEVICE_TYPE_RE
     }
   }
 
-  return SetStreamPath(m_busDevices[addr]->GetPhysicalAddress());
+  return SetStreamPath(m_busDevices[addr]->GetPhysicalAddress()) &&
+      m_busDevices[addr]->TransmitActiveSource();
 }
 
 bool CCECProcessor::SetActiveView(void)
 {
-  return SetActiveSource();
+  return SetActiveSource(m_types.IsEmpty() ? CEC_DEVICE_TYPE_RESERVED : m_types[0]);
 }
 
 bool CCECProcessor::SetDeckControlMode(cec_deck_control_mode mode, bool bSendUpdate /* = true */)
@@ -359,12 +346,7 @@ bool CCECProcessor::SetStreamPath(uint16_t iStreamPath)
   CCECBusDevice *device = GetDeviceByPhysicalAddress(iStreamPath);
   if (device)
   {
-    for (unsigned int iPtr = 0; iPtr < 16; iPtr++)
-      m_busDevices[iPtr]->m_bActiveSource = false;
-
-    device->m_bActiveSource = true;
-    device->m_powerStatus   = CEC_POWER_STATUS_ON;
-
+    device->SetActiveDevice();
     bReturn = true;
   }
 
@@ -376,7 +358,7 @@ bool CCECProcessor::SetInactiveView(void)
   if (!IsRunning())
     return false;
 
-  if (!m_logicalAddresses.empty() && m_busDevices[m_logicalAddresses.primary])
+  if (!m_logicalAddresses.IsEmpty() && m_busDevices[m_logicalAddresses.primary])
     return m_busDevices[m_logicalAddresses.primary]->TransmitInactiveView();
   return false;
 }
@@ -401,8 +383,8 @@ bool CCECProcessor::SetLogicalAddress(cec_logical_address iLogicalAddress)
     strLog.Format("<< setting primary logical address to %1x", iLogicalAddress);
     m_controller->AddLog(CEC_LOG_NOTICE, strLog.c_str());
     m_logicalAddresses.primary = iLogicalAddress;
-    m_logicalAddresses.set(iLogicalAddress);
-    return SetAckMask(m_logicalAddresses.ackmask());
+    m_logicalAddresses.Set(iLogicalAddress);
+    return SetAckMask(m_logicalAddresses.AckMask());
   }
 
   return true;
@@ -424,7 +406,7 @@ bool CCECProcessor::SetMenuState(cec_menu_state state, bool bSendUpdate /* = tru
 
 bool CCECProcessor::SetPhysicalAddress(uint16_t iPhysicalAddress)
 {
-  if (!m_logicalAddresses.empty() && m_busDevices[m_logicalAddresses.primary])
+  if (!m_logicalAddresses.IsEmpty() && m_busDevices[m_logicalAddresses.primary])
   {
     m_busDevices[m_logicalAddresses.primary]->SetPhysicalAddress(iPhysicalAddress);
     return SetActiveView();
@@ -442,7 +424,7 @@ bool CCECProcessor::SwitchMonitoring(bool bEnable)
   if (bEnable)
     return SetAckMask(0);
   else
-    return SetAckMask(m_logicalAddresses.ackmask());
+    return SetAckMask(m_logicalAddresses.AckMask());
 }
 
 bool CCECProcessor::PollDevice(cec_logical_address iAddress)
@@ -561,9 +543,9 @@ void CCECProcessor::TransmitAbort(cec_logical_address address, cec_opcode opcode
 
   cec_command command;
   // TODO
-  cec_command::format(command, m_logicalAddresses.primary, address, CEC_OPCODE_FEATURE_ABORT);
-  command.parameters.push_back((uint8_t)opcode);
-  command.parameters.push_back((uint8_t)reason);
+  cec_command::Format(command, m_logicalAddresses.primary, address, CEC_OPCODE_FEATURE_ABORT);
+  command.parameters.PushBack((uint8_t)opcode);
+  command.parameters.PushBack((uint8_t)reason);
 
   Transmit(command);
 }
@@ -624,7 +606,7 @@ bool CCECProcessor::ParseMessage(const CCECAdapterMessage &msg)
   {
   case MSGCODE_FRAME_START:
     {
-      m_currentframe.clear();
+      m_currentframe.Clear();
       if (msg.size() >= 2)
       {
         m_currentframe.initiator   = msg.initiator();
@@ -638,7 +620,7 @@ bool CCECProcessor::ParseMessage(const CCECAdapterMessage &msg)
     {
       if (msg.size() >= 2)
       {
-        m_currentframe.push_back(msg[1]);
+        m_currentframe.PushBack(msg[1]);
         m_currentframe.eom = msg.eom();
       }
       bEom = msg.eom();
@@ -659,13 +641,13 @@ void CCECProcessor::ParseCommand(cec_command &command)
     dataStr.AppendFormat(":%02x", (unsigned int)command.parameters[iPtr]);
   m_controller->AddLog(CEC_LOG_TRAFFIC, dataStr.c_str());
 
-  if (!m_bMonitor)
+  if (!m_bMonitor && command.initiator >= CECDEVICE_TV && command.initiator <= CECDEVICE_BROADCAST)
     m_busDevices[(uint8_t)command.initiator]->HandleCommand(command);
 }
 
 uint16_t CCECProcessor::GetPhysicalAddress(void) const
 {
-  if (!m_logicalAddresses.empty() && m_busDevices[m_logicalAddresses.primary])
+  if (!m_logicalAddresses.IsEmpty() && m_busDevices[m_logicalAddresses.primary])
     return m_busDevices[m_logicalAddresses.primary]->GetPhysicalAddress();
   return false;
 }