using namespace std;
CCECProcessor::CCECProcessor(CLibCEC *controller, CAdapterCommunication *serComm, const char *strDeviceName, cec_logical_address iLogicalAddress /* = CECDEVICE_PLAYBACKDEVICE1 */, uint16_t iPhysicalAddress /* = CEC_DEFAULT_PHYSICAL_ADDRESS*/) :
- m_iLogicalAddress(iLogicalAddress),
+ m_iLogicalAddress(CECDEVICE_UNKNOWN),
m_strDeviceName(strDeviceName),
m_communication(serComm),
m_controller(controller),
CCECProcessor::~CCECProcessor(void)
{
+ m_startCondition.Broadcast();
StopThread();
m_communication = NULL;
m_controller = NULL;
bool CCECProcessor::Start(void)
{
+ CLockObject lock(&m_mutex);
if (!m_communication || !m_communication->IsOpen())
{
m_controller->AddLog(CEC_LOG_ERROR, "connection is closed");
}
if (CreateThread())
+ {
+ if (!m_startCondition.Wait(&m_mutex))
+ {
+ m_controller->AddLog(CEC_LOG_ERROR, "could not create a processor thread");
+ return false;
+ }
return true;
+ }
else
m_controller->AddLog(CEC_LOG_ERROR, "could not create a processor thread");
void *CCECProcessor::Process(void)
{
- m_controller->AddLog(CEC_LOG_DEBUG, "processor thread started");
+ {
+ CLockObject lock(&m_mutex);
+ m_controller->AddLog(CEC_LOG_DEBUG, "processor thread started");
+ m_startCondition.Signal();
+ }
- cec_command command;
- CCECAdapterMessage msg;
+ cec_command command;
+ CCECAdapterMessage msg;
+ CCECAdapterMessagePtr msgPtr;
+
+ m_communication->SetAckMask(0x1 << (uint8_t)m_iLogicalAddress);
while (!IsStopped())
{
{
CLockObject lock(&m_mutex);
- if (m_frameBuffer.Pop(msg) ||
- (m_communication->IsOpen() && m_communication->Read(msg, 50)))
- bParseFrame = ParseMessage(msg);
+ if (m_frameBuffer.Pop(msgPtr))
+ bParseFrame = ParseMessage(msgPtr);
+ else if (m_communication->IsOpen() && m_communication->Read(msg, 50))
+ {
+ msgPtr = CCECAdapterMessagePtr(new CCECAdapterMessage(msg));
+ bParseFrame = ParseMessage(msgPtr);
+ }
bParseFrame &= !IsStopped();
if (bParseFrame)
return m_communication && m_communication->SetAckMask(0x1 << (uint8_t)m_iLogicalAddress);
}
-bool CCECProcessor::Transmit(const cec_command &data, bool bWaitForAck /* = true */)
+cec_version CCECProcessor::GetDeviceCecVersion(cec_logical_address iAddress)
+{
+ return m_busDevices[iAddress]->GetCecVersion();
+}
+
+bool CCECProcessor::GetDeviceMenuLanguage(cec_logical_address iAddress, cec_menu_language *language)
+{
+ *language = m_busDevices[iAddress]->GetMenuLanguage();
+ return (strcmp(language->language, "???"));
+}
+
+uint64_t CCECProcessor::GetDeviceVendorId(cec_logical_address iAddress)
+{
+ return m_busDevices[iAddress]->GetVendorId();
+}
+
+cec_power_status CCECProcessor::GetDevicePowerStatus(cec_logical_address iAddress)
+{
+ return m_busDevices[iAddress]->GetPowerStatus();
+}
+
+bool CCECProcessor::Transmit(const cec_command &data)
{
bool bReturn(false);
LogOutput(data);
CCECAdapterMessagePtr output(new CCECAdapterMessage(data));
CLockObject lock(&m_mutex);
- if (!m_communication || !m_communication->Write(output))
- return bReturn;
-
- if (bWaitForAck)
- {
- bool bError(false);
- if ((bReturn = WaitForAck(&bError, output->size(), 1000)) == false)
- m_controller->AddLog(CEC_LOG_ERROR, "did not receive ack");
- }
- else
{
- bReturn = true;
+ CLockObject msgLock(&output->mutex);
+ if (!m_communication || !m_communication->Write(output))
+ return bReturn;
+ else
+ {
+ output->condition.Wait(&output->mutex);
+ if (output->state != ADAPTER_MESSAGE_STATE_SENT)
+ {
+ m_controller->AddLog(CEC_LOG_ERROR, "command was not sent");
+ return bReturn;
+ }
+ }
+
+ if (data.ack_timeout > 0)
+ {
+ bool bError(false);
+ if ((bReturn = WaitForAck(&bError, output->size(), data.ack_timeout)) == false)
+ m_controller->AddLog(CEC_LOG_ERROR, "did not receive ack");
+ }
+ else
+ {
+ bReturn = true;
+ }
}
return bReturn;
*bError = true;
break;
default:
- m_frameBuffer.Push(msg);
+ CCECAdapterMessagePtr msgPtr = CCECAdapterMessagePtr(new CCECAdapterMessage(msg));
+ m_frameBuffer.Push(msgPtr);
break;
}
return bTransmitSucceeded && !*bError;
}
-bool CCECProcessor::ParseMessage(CCECAdapterMessage &msg)
+bool CCECProcessor::ParseMessage(CCECAdapterMessagePtr msg)
{
bool bEom = false;
- if (msg.empty())
+ if (msg->empty())
return bEom;
CStdString logStr;
- switch(msg.message())
+ switch(msg->message())
{
case MSGCODE_NOTHING:
m_controller->AddLog(CEC_LOG_DEBUG, "MSGCODE_NOTHING");
case MSGCODE_HIGH_ERROR:
case MSGCODE_LOW_ERROR:
{
- if (msg.message() == MSGCODE_TIMEOUT_ERROR)
+ if (msg->message() == MSGCODE_TIMEOUT_ERROR)
logStr = "MSGCODE_TIMEOUT";
- else if (msg.message() == MSGCODE_HIGH_ERROR)
+ else if (msg->message() == MSGCODE_HIGH_ERROR)
logStr = "MSGCODE_HIGH_ERROR";
else
logStr = "MSGCODE_LOW_ERROR";
- int iLine = (msg.size() >= 3) ? (msg[1] << 8) | (msg[2]) : 0;
- uint32_t iTime = (msg.size() >= 7) ? (msg[3] << 24) | (msg[4] << 16) | (msg[5] << 8) | (msg[6]) : 0;
+ int iLine = (msg->size() >= 3) ? (msg->at(1) << 8) | (msg->at(2)) : 0;
+ uint32_t iTime = (msg->size() >= 7) ? (msg->at(3) << 24) | (msg->at(4) << 16) | (msg->at(5) << 8) | (msg->at(6)) : 0;
logStr.AppendFormat(" line:%i", iLine);
logStr.AppendFormat(" time:%u", iTime);
m_controller->AddLog(CEC_LOG_WARNING, logStr.c_str());
{
logStr = "MSGCODE_FRAME_START";
m_currentframe.clear();
- if (msg.size() >= 2)
+ if (msg->size() >= 2)
{
- logStr.AppendFormat(" initiator:%u destination:%u ack:%s %s", msg.initiator(), msg.destination(), msg.ack() ? "high" : "low", msg.eom() ? "eom" : "");
- m_currentframe.initiator = msg.initiator();
- m_currentframe.destination = msg.destination();
- m_currentframe.ack = msg.ack();
- m_currentframe.eom = msg.eom();
+ logStr.AppendFormat(" initiator:%u destination:%u ack:%s %s", msg->initiator(), msg->destination(), msg->ack() ? "high" : "low", msg->eom() ? "eom" : "");
+ m_currentframe.initiator = msg->initiator();
+ m_currentframe.destination = msg->destination();
+ m_currentframe.ack = msg->ack();
+ m_currentframe.eom = msg->eom();
}
m_controller->AddLog(CEC_LOG_DEBUG, logStr.c_str());
}
case MSGCODE_FRAME_DATA:
{
logStr = "MSGCODE_FRAME_DATA";
- if (msg.size() >= 2)
+ if (msg->size() >= 2)
{
- uint8_t iData = msg[1];
+ uint8_t iData = msg->at(1);
logStr.AppendFormat(" %02x", iData);
m_currentframe.push_back(iData);
- m_currentframe.eom = msg.eom();
+ m_currentframe.eom = msg->eom();
}
m_controller->AddLog(CEC_LOG_DEBUG, logStr.c_str());
- bEom = msg.eom();
+ bEom = msg->eom();
}
break;
case MSGCODE_COMMAND_ACCEPTED: