CCECProcessor::~CCECProcessor(void)
{
m_bStarted = false;
- StopThread(false);
-
- if (m_busScan)
- {
- m_busScan->StopThread();
- delete m_busScan;
- }
-
m_startCondition.Broadcast();
StopThread();
}
lock.Leave();
- if (SetAckMask(m_logicalAddresses.AckMask()) &&
- SetHDMIPort(m_iBaseDevice, m_iHDMIPort, true))
+
+ m_busDevices[CECDEVICE_TV]->GetVendorId();
+
+ if (SetHDMIPort(m_iBaseDevice, m_iHDMIPort, true))
{
m_controller->AddLog(CEC_LOG_DEBUG, "processor thread started");
m_busScan = new CCECBusScan(this);
}
else
{
- m_busDevices[m_logicalAddresses.primary]->TransmitPhysicalAddress();
+ SetAckMask(m_logicalAddresses.AckMask());
+
CLockObject lock(&m_mutex);
m_bStarted = true;
m_controller->AddLog(CEC_LOG_DEBUG, "processor thread started");
m_controller->CheckKeypressTimeout();
}
+ if (m_busScan)
+ {
+ m_busScan->StopThread();
+ delete m_busScan;
+ m_busScan = NULL;
+ }
+
if (m_communication)
m_communication->Close();
m_iRetryLineTimeout = iTimeout;
}
-bool CCECProcessor::SetActiveSource(cec_logical_address iAddress)
-{
- return SetStreamPath(m_busDevices[iAddress]->GetPhysicalAddress(false));
-}
-
bool CCECProcessor::SetActiveView(void)
{
return SetActiveSource(m_types.IsEmpty() ? CEC_DEVICE_TYPE_RESERVED : m_types[0]);
{
bool bReturn(false);
- CStdString strLog;
- strLog.Format("setting HDMI port to %d on device %s (%d)", iPort, ToString(iBaseDevice), (int)iBaseDevice);
- AddLog(CEC_LOG_DEBUG, strLog);
-
m_iBaseDevice = iBaseDevice;
m_iHDMIPort = iPort;
if (!m_bStarted && !bForce)
return true;
+ CStdString strLog;
+ strLog.Format("setting HDMI port to %d on device %s (%d)", iPort, ToString(iBaseDevice), (int)iBaseDevice);
+ AddLog(CEC_LOG_DEBUG, strLog);
+
uint16_t iPhysicalAddress(0);
iPhysicalAddress = m_busDevices[iBaseDevice]->GetPhysicalAddress();
uint16_t iPos = 0;
{
for (uint8_t iPtr = 0; iPtr < 15; iPtr++)
if (m_logicalAddresses[iPtr])
+ {
+ m_busDevices[iPtr]->SetInactiveDevice();
m_busDevices[iPtr]->SetPhysicalAddress(iPhysicalAddress);
+ m_busDevices[iPtr]->TransmitPhysicalAddress();
+ }
return SetActiveView();
}
return false;
CLockObject lock(&m_mutex);
m_bMonitor = bEnable;
- if (bEnable)
+ if (!bEnable)
{
if (!m_busScan)
{
return false;
}
+uint16_t CCECProcessor::GetDevicePhysicalAddress(cec_logical_address iAddress)
+{
+ if (m_busDevices[iAddress])
+ return m_busDevices[iAddress]->GetPhysicalAddress(false);
+ return false;
+}
+
cec_power_status CCECProcessor::GetDevicePowerStatus(cec_logical_address iAddress)
{
if (m_busDevices[iAddress])
return CEC_POWER_STATUS_UNKNOWN;
}
+cec_logical_address CCECProcessor::GetActiveSource(void)
+{
+ for (uint8_t iPtr = 0; iPtr <= 11; iPtr++)
+ {
+ if (m_busDevices[iPtr]->IsActiveSource())
+ return (cec_logical_address)iPtr;
+ }
+
+ return CECDEVICE_UNKNOWN;
+}
+
+bool CCECProcessor::IsActiveSource(cec_logical_address iAddress)
+{
+ return m_busDevices[iAddress]->IsActiveSource();
+}
+
bool CCECProcessor::Transmit(const cec_command &data)
{
bool bReturn(false);
void *CCECBusScan::Process(void)
{
CCECBusDevice *device(NULL);
+ uint8_t iCounter(0);
while (!IsStopped())
{
+ if (++iCounter < 30)
+ {
+ Sleep(1000);
+ continue;
+ }
for (unsigned int iPtr = 0; iPtr <= 11 && !IsStopped(); iPtr++)
{
device = m_processor->m_busDevices[iPtr];