cec: handle samsung remote command 'return'

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

diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp
index 27848252eb7215ecf47536ac9f55e840b8063161..2e53d6b9271742e3cf41140adea44b99f4653743 100644 (file)
--- a/src/lib/CECProcessor.cpp
+++ b/src/lib/CECProcessor.cpp
@@ -184,10 +184,10 @@ void CCECProcessor::LogOutput(const cec_command &data)
 {
   CStdString txStr = "transmit ";
   txStr.AppendFormat(" %02x", ((uint8_t)data.initiator << 4) + (uint8_t)data.destination);
-  txStr.AppendFormat(" %02x", (uint8_t)data.opcode);
+  txStr.AppendFormat(":%02x", (uint8_t)data.opcode);
 
   for (uint8_t iPtr = 0; iPtr < data.parameters.size; iPtr++)
-    txStr.AppendFormat(" %02x", data.parameters[iPtr]);
+    txStr.AppendFormat(":%02x", data.parameters[iPtr]);
   m_controller->AddLog(CEC_LOG_DEBUG, txStr.c_str());
 }
 
@@ -541,19 +541,96 @@ void CCECProcessor::ParseVendorId(cec_logical_address device, const cec_datapack
   m_controller->AddLog(CEC_LOG_DEBUG, strLog.c_str());
 }
 
-void CCECProcessor::ParseCommand(cec_command &command)
+bool CCECProcessor::HandleANCommand(cec_command &command)
 {
-  CStdString dataStr;
-  dataStr.Format(">> received frame: %1x%1x:%02x", command.initiator, command.destination, command.opcode);
-  if (command.parameters.size > 1)
+  bool bHandled(true);
+  if (command.destination == m_iLogicalAddress)
   {
-    for (uint8_t iPtr = 0; iPtr < command.parameters.size; iPtr++)
-      dataStr.AppendFormat(":%02x", (unsigned int)command.parameters[iPtr]);
+    switch(command.opcode)
+    {
+    case CEC_OPCODE_VENDOR_REMOTE_BUTTON_DOWN:
+      if (command.parameters.size > 0)
+      {
+        m_controller->AddKey();
+
+        uint8_t iButton = 0;
+        switch (command.parameters[0])
+        {
+        case CEC_AN_USER_CONTROL_CODE_RETURN:
+          iButton = CEC_USER_CONTROL_CODE_PREVIOUS_CHANNEL;
+          break;
+        default:
+          break;
+        }
+
+        if (iButton > 0 && iButton <= CEC_USER_CONTROL_CODE_MAX)
+        {
+          CStdString strLog;
+          strLog.Format("key pressed: %1x", iButton);
+          m_controller->AddLog(CEC_LOG_DEBUG, strLog.c_str());
+
+          m_controller->SetCurrentButton((cec_user_control_code) command.parameters[0]);
+        }
+      }
+      break;
+    case CEC_OPCODE_VENDOR_REMOTE_BUTTON_UP:
+      m_controller->AddKey();
+      break;
+    default:
+      bHandled = false;
+      break;
+    }
+  }
+  else if (command.destination == CECDEVICE_BROADCAST)
+  {
+    switch(command.opcode)
+    {
+    // TODO
+    default:
+      bHandled = false;
+      break;
+    }
   }
-  m_controller->AddLog(CEC_LOG_DEBUG, dataStr.c_str());
 
-  if (m_bMonitor)
-    return;
+  if (!bHandled)
+    bHandled = HandleCecCommand(command);
+
+  return bHandled;
+}
+
+bool CCECProcessor::HandleSLCommand(cec_command &command)
+{
+  bool bHandled(true);
+  if (command.destination == m_iLogicalAddress)
+  {
+    switch(command.opcode)
+    {
+    // TODO
+    default:
+      bHandled = false;
+      break;
+    }
+  }
+  else if (command.destination == CECDEVICE_BROADCAST)
+  {
+    switch(command.opcode)
+    {
+    // TODO
+    default:
+      bHandled = false;
+      break;
+    }
+  }
+
+  if (!bHandled)
+    bHandled = HandleCecCommand(command);
+
+  return bHandled;
+}
+
+bool CCECProcessor::HandleCecCommand(cec_command &command)
+{
+  bool bHandled(true);
 
   if (command.destination == m_iLogicalAddress)
   {
@@ -608,6 +685,7 @@ void CCECProcessor::ParseCommand(cec_command &command)
       break;
     default:
       m_controller->AddCommand(command);
+      bHandled = false;
       break;
     }
   }
@@ -644,6 +722,7 @@ void CCECProcessor::ParseCommand(cec_command &command)
       break;
     default:
       m_controller->AddCommand(command);
+      bHandled = false;
       break;
     }
   }
@@ -652,6 +731,34 @@ void CCECProcessor::ParseCommand(cec_command &command)
     CStdString strLog;
     strLog.Format("ignoring frame: destination: %u != %u", command.destination, (uint8_t)m_iLogicalAddress);
     m_controller->AddLog(CEC_LOG_DEBUG, strLog.c_str());
+    bHandled = false;
+  }
+
+  return bHandled;
+}
+
+void CCECProcessor::ParseCommand(cec_command &command)
+{
+  CStdString dataStr;
+  dataStr.Format(">> received frame: %1x%1x:%02x", command.initiator, command.destination, command.opcode);
+  for (uint8_t iPtr = 0; iPtr < command.parameters.size; iPtr++)
+    dataStr.AppendFormat(":%02x", (unsigned int)command.parameters[iPtr]);
+  m_controller->AddLog(CEC_LOG_DEBUG, dataStr.c_str());
+
+  if (!m_bMonitor)
+  {
+    switch(m_vendorIds[command.initiator])
+    {
+    case CEC_VENDOR_LG:
+      HandleSLCommand(command);
+      break;
+    case CEC_VENDOR_SAMSUNG:
+      HandleANCommand(command);
+      break;
+    default:
+      HandleCecCommand(command);
+      break;
+    }
   }
 }