m_strDeviceName(strDeviceName),
m_controller(controller),
m_bMonitor(false),
- m_busScan(NULL)
+ m_busScan(NULL),
+ m_iStandardLineTimeout(3),
+ m_iRetryLineTimeout(3)
{
m_communication = new CAdapterCommunication(this);
m_logicalAddresses.Clear();
m_strDeviceName(strDeviceName),
m_types(types),
m_controller(controller),
- m_bMonitor(false)
+ m_bMonitor(false),
+ m_iStandardLineTimeout(3),
+ m_iRetryLineTimeout(3)
{
m_communication = new CAdapterCommunication(this);
m_logicalAddresses.Clear();
if (SetAckMask(m_logicalAddresses.AckMask()) &&
SetHDMIPort(m_iBaseDevice, m_iHDMIPort, true))
{
- m_controller->AddLog(CEC_LOG_ERROR, "processor thread started");
+ m_controller->AddLog(CEC_LOG_DEBUG, "processor thread started");
m_busScan = new CCECBusScan(this);
m_busScan->CreateThread(true);
return true;
return bReturn;
}
+void CCECProcessor::SetStandardLineTimeout(uint8_t iTimeout)
+{
+ CLockObject lock(&m_mutex);
+ m_iStandardLineTimeout = iTimeout;
+}
+
+void CCECProcessor::SetRetryLineTimeout(uint8_t iTimeout)
+{
+ CLockObject lock(&m_mutex);
+ m_iRetryLineTimeout = iTimeout;
+}
+
bool CCECProcessor::SetActiveSource(cec_logical_address iAddress)
{
return SetStreamPath(m_busDevices[iAddress]->GetPhysicalAddress(false));
return false;
}
-uint8_t CCECProcessor::VolumeUp(bool bWait /* = true */)
+uint8_t CCECProcessor::VolumeUp(void)
{
uint8_t status = 0;
if (IsActiveDevice(CECDEVICE_AUDIOSYSTEM))
- status = ((CCECAudioSystem *)m_busDevices[CECDEVICE_AUDIOSYSTEM])->VolumeUp(bWait);
+ status = ((CCECAudioSystem *)m_busDevices[CECDEVICE_AUDIOSYSTEM])->VolumeUp();
return status;
}
-uint8_t CCECProcessor::VolumeDown(bool bWait /* = true */)
+uint8_t CCECProcessor::VolumeDown(void)
{
uint8_t status = 0;
if (IsActiveDevice(CECDEVICE_AUDIOSYSTEM))
- status = ((CCECAudioSystem *)m_busDevices[CECDEVICE_AUDIOSYSTEM])->VolumeDown(bWait);
+ status = ((CCECAudioSystem *)m_busDevices[CECDEVICE_AUDIOSYSTEM])->VolumeDown();
return status;
}
-uint8_t CCECProcessor::MuteAudio(bool bWait /* = true */)
+uint8_t CCECProcessor::MuteAudio(void)
{
uint8_t status = 0;
if (IsActiveDevice(CECDEVICE_AUDIOSYSTEM))
- status = ((CCECAudioSystem *)m_busDevices[CECDEVICE_AUDIOSYSTEM])->MuteAudio(bWait);
+ status = ((CCECAudioSystem *)m_busDevices[CECDEVICE_AUDIOSYSTEM])->MuteAudio();
return status;
}
bool bReturn(false);
CLockObject lock(&m_mutex);
{
- m_communication->SetLineTimeout(3);
+ m_communication->SetLineTimeout(m_iStandardLineTimeout);
+ output->tries = 1;
do
{
if (output->tries > 0)
- m_communication->SetLineTimeout(5);
+ m_communication->SetLineTimeout(m_iRetryLineTimeout);
CLockObject msgLock(&output->mutex);
if (!m_communication || !m_communication->Write(output))
}
else
bReturn = true;
- }while (output->transmit_timeout > 0 && output->needs_retry() && ++output->tries <= output->maxTries);
+ }while (output->transmit_timeout > 0 && output->needs_retry() && ++output->tries < output->maxTries);
}
- m_communication->SetLineTimeout(3);
+ m_communication->SetLineTimeout(m_iStandardLineTimeout);
return bReturn;
}
m_currentframe.ack = msg.ack();
m_currentframe.eom = msg.eom();
}
- if (m_currentframe.ack == true)
+ if (m_currentframe.ack == 0x1)
{
m_lastInitiator = m_currentframe.initiator;
m_busDevices[m_lastInitiator]->GetHandler()->HandlePoll(m_currentframe.initiator, m_currentframe.destination);
return bReturn;
}
-bool CCECProcessor::SendKeypress(cec_logical_address iDestination, cec_user_control_code key, bool bWait /* = false */)
+bool CCECProcessor::TransmitKeypress(cec_logical_address iDestination, cec_user_control_code key)
{
- return m_busDevices[iDestination]->SendKeypress(key, bWait);
+ return m_busDevices[iDestination]->TransmitKeypress(key);
}
-bool CCECProcessor::SendKeyRelease(cec_logical_address iDestination, bool bWait /* = false */)
+bool CCECProcessor::TransmitKeyRelease(cec_logical_address iDestination)
{
- return m_busDevices[iDestination]->SendKeyRelease(bWait);
+ return m_busDevices[iDestination]->TransmitKeyRelease();
}
const char *CCECProcessor::ToString(const cec_menu_state state)
void *CCECBusScan::Process(void)
{
CCECBusDevice *device(NULL);
+ int iCount(50);
while (!IsStopped())
{
- for (unsigned int iPtr = 0; iPtr < 15 && !IsStopped(); iPtr++)
+ if (iCount == 0)
{
- device = m_processor->m_busDevices[iPtr];
- if (device && device->GetStatus() == CEC_DEVICE_STATUS_PRESENT)
+ for (unsigned int iPtr = 0; iPtr <= 11 && !IsStopped(); iPtr++)
{
- if (!IsStopped())
- device->GetVendorId();
- Sleep(5);
+ device = m_processor->m_busDevices[iPtr];
+ if (device && device->GetStatus(true) == CEC_DEVICE_STATUS_PRESENT)
+ {
+ if (!IsStopped())
+ {
+ device->GetVendorId();
+ Sleep(5);
+ }
+ if (!IsStopped())
+ {
+ device->GetPowerStatus(true);
+ Sleep(5);
+ }
+ }
}
}
- Sleep(5000);
+
+ if (++iCount > 60)
+ iCount = 0;
+ Sleep(1000);
}
return NULL;
}