return SetActiveView();
}
+bool CCECProcessor::SetOSDString(cec_logical_address iLogicalAddress, cec_display_control duration, const char *strMessage)
+{
+ CStdString strLog;
+ strLog.Format("<< display message '%s'", strMessage);
+ m_controller->AddLog(CEC_LOG_NOTICE, strLog.c_str());
+
+ cec_command command;
+ cec_command::format(command, m_iLogicalAddress, iLogicalAddress, CEC_OPCODE_SET_OSD_STRING);
+ command.parameters.push_back((uint8_t)duration);
+
+ for (unsigned int iPtr = 0; iPtr < strlen(strMessage); iPtr++)
+ command.parameters.push_back(strMessage[iPtr]);
+
+ return Transmit(command);
+}
+
bool CCECProcessor::TransmitFormatted(const cec_adapter_message &data, bool bWaitForAck /* = true */)
{
CLockObject lock(&m_mutex);
case CEC_OPCODE_GIVE_DEVICE_VENDOR_ID:
ReportVendorID(command.initiator);
break;
+ case CEC_OPCODE_DEVICE_VENDOR_ID:
+ ParseVendorId(command.initiator, command.parameters);
+ break;
case CEC_OPCODE_VENDOR_COMMAND_WITH_ID:
ParseVendorId(command.initiator, command.parameters);
- TransmitAbort(command.initiator, CEC_OPCODE_VENDOR_COMMAND_WITH_ID);
break;
case CEC_OPCODE_GIVE_DECK_STATUS:
// need to support opcodes play and deck control before doing anything with this
m_controller->AddKey();
if (command.parameters[0] <= CEC_USER_CONTROL_CODE_MAX)
+ {
+ CStdString strLog;
+ strLog.Format("key pressed: %1x", command.parameters[0]);
+ m_controller->AddLog(CEC_LOG_DEBUG, strLog.c_str());
+
m_controller->SetCurrentButton((cec_user_control_code) command.parameters[0]);
+ }
}
break;
case CEC_OPCODE_USER_CONTROL_RELEASE:
m_controller->AddKey();
break;
- case CEC_OPCODE_ROUTING_CHANGE:
- m_controller->SetActiveView();
- break;
default:
m_controller->AddCommand(command);
break;
else if (command.destination == CECDEVICE_BROADCAST)
{
CStdString strLog;
- if (command.opcode == CEC_OPCODE_REQUEST_ACTIVE_SOURCE)
+ switch (command.opcode)
{
+ case CEC_OPCODE_REQUEST_ACTIVE_SOURCE:
strLog.Format(">> %i requests active source", (uint8_t) command.initiator);
m_controller->AddLog(CEC_LOG_DEBUG, strLog.c_str());
BroadcastActiveSource();
- }
- else if (command.opcode == CEC_OPCODE_SET_STREAM_PATH)
- {
+ break;
+ case CEC_OPCODE_SET_STREAM_PATH:
if (command.parameters.size >= 2)
{
- int streamaddr = ((int)command.parameters[0] << 8) | ((int)command.parameters[1]);
+ int streamaddr = ((uint16_t)command.parameters[0] << 8) | ((uint16_t)command.parameters[1]);
strLog.Format(">> %i requests stream path from physical address %04x", command.initiator, streamaddr);
m_controller->AddLog(CEC_LOG_DEBUG, strLog.c_str());
if (streamaddr == m_iPhysicalAddress)
BroadcastActiveSource();
}
- }
- else
- {
+ break;
+ case CEC_OPCODE_ROUTING_CHANGE:
+ if (command.parameters.size == 4)
+ {
+ uint16_t iOldAddress = ((uint16_t)command.parameters[0] << 8) | ((uint16_t)command.parameters[1]);
+ uint16_t iNewAddress = ((uint16_t)command.parameters[2] << 8) | ((uint16_t)command.parameters[3]);
+ strLog.Format(">> %i changed physical address from %04x to %04x", command.initiator, iOldAddress, iNewAddress);
+ m_controller->AddLog(CEC_LOG_DEBUG, strLog.c_str());
+
+ m_controller->AddCommand(command);
+ }
+ break;
+ default:
m_controller->AddCommand(command);
+ break;
}
}
else