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;
CCECAdapterMessagePtr msgPtr;
+ m_communication->SetAckMask(0x1 << (uint8_t)m_iLogicalAddress);
+
while (!IsStopped())
{
bool bParseFrame(false);
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;