}
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))
{
+ /* init the default handler */
+ if (m_busDevices[CECDEVICE_TV]->GetHandler()->GetVendorId() == CEC_VENDOR_UNKNOWN)
+ m_busDevices[CECDEVICE_TV]->GetHandler()->InitHandler();
+
m_controller->AddLog(CEC_LOG_DEBUG, "processor thread started");
m_busScan = new CCECBusScan(this);
m_busScan->CreateThread(true);
{
if (m_busDevices[address]->TryLogicalAddress())
{
- /* only set our OSD name and active source for the primary device */
- if (m_logicalAddresses.IsEmpty())
- {
- m_busDevices[address]->m_strDeviceName = m_strDeviceName;
- m_busDevices[address]->m_bActiveSource = true;
- }
m_logicalAddresses.Set(address);
return true;
}
}
else
{
- m_busDevices[CECDEVICE_TV]->GetVendorId();
- m_busDevices[m_logicalAddresses.primary]->TransmitVendorID(CECDEVICE_TV, false);
+ /* only set our OSD name and active source for the primary device */
+ m_busDevices[m_logicalAddresses.primary]->m_strDeviceName = m_strDeviceName;
+ m_busDevices[m_logicalAddresses.primary]->m_bActiveSource = true;
+
+ SetAckMask(m_logicalAddresses.AckMask());
CLockObject lock(&m_mutex);
m_bStarted = true;
}
}
- bReturn = m_busDevices[addr]->TransmitActiveSource() &&
- SetStreamPath(m_busDevices[addr]->GetPhysicalAddress(false));
+ m_busDevices[addr]->SetActiveSource();
+ bReturn = m_busDevices[addr]->TransmitActiveSource();
if (bReturn && (m_busDevices[addr]->GetType() == CEC_DEVICE_TYPE_PLAYBACK_DEVICE ||
m_busDevices[addr]->GetType() == CEC_DEVICE_TYPE_RECORDING_DEVICE))
return bReturn;
}
+bool CCECProcessor::SetActiveSource(uint16_t iStreamPath)
+{
+ bool bReturn(false);
+
+ CCECBusDevice *device = GetDeviceByPhysicalAddress(iStreamPath);
+ if (device)
+ {
+ device->SetActiveSource();
+ bReturn = true;
+ }
+
+ return bReturn;
+}
+
void CCECProcessor::SetStandardLineTimeout(uint8_t iTimeout)
{
CLockObject lock(&m_mutex);
{
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;
- if (iPhysicalAddress == 0)
- iPos = 0x1000;
- else if (iPhysicalAddress % 0x1000 == 0)
- iPos = 0x100;
- else if (iPhysicalAddress % 0x100 == 0)
- iPos = 0x10;
- else if (iPhysicalAddress % 0x10 == 0)
- iPos = 0x1;
-
- while(!bReturn && iPos > 0)
+ if (iBaseDevice > CECDEVICE_TV)
+ iPhysicalAddress = m_busDevices[iBaseDevice]->GetPhysicalAddress();
+
+ if (iPhysicalAddress == 0xffff)
{
- iPhysicalAddress += (uint16_t)(iPort * iPos);
- strLog.Format("checking physical address %4x", iPhysicalAddress);
- AddLog(CEC_LOG_DEBUG, strLog);
- if (PhysicalAddressInUse(iPhysicalAddress))
- {
- strLog.Format("physical address %4x is in use", iPhysicalAddress);
- AddLog(CEC_LOG_DEBUG, strLog);
- iPos = (iPos == 1) ? 0 : iPos / 0x10;
- }
- else
+ SetPhysicalAddress((uint16_t)iPort * 0x1000);
+ bReturn = false;
+ }
+ else
+ {
+ uint16_t iPos = 0;
+ if (iPhysicalAddress == 0)
+ iPos = 0x1000;
+ else if (iPhysicalAddress % 0x1000 == 0)
+ iPos = 0x100;
+ else if (iPhysicalAddress % 0x100 == 0)
+ iPos = 0x10;
+ else if (iPhysicalAddress % 0x10 == 0)
+ iPos = 0x1;
+
+ while(!bReturn && iPos > 0)
{
- strLog.Format("physical address %4x is free", iPhysicalAddress);
+ iPhysicalAddress += (uint16_t)(iPort * iPos);
+ strLog.Format("checking physical address %4x", iPhysicalAddress);
AddLog(CEC_LOG_DEBUG, strLog);
- SetPhysicalAddress(iPhysicalAddress);
- bReturn = true;
+ if (PhysicalAddressInUse(iPhysicalAddress))
+ {
+ strLog.Format("physical address %4x is in use", iPhysicalAddress);
+ AddLog(CEC_LOG_DEBUG, strLog);
+ iPos = (iPos == 1) ? 0 : iPos / 0x10;
+ }
+ else
+ {
+ strLog.Format("physical address %4x is free", iPhysicalAddress);
+ AddLog(CEC_LOG_DEBUG, strLog);
+ SetPhysicalAddress(iPhysicalAddress);
+ bReturn = true;
+ }
}
}
return false;
}
-bool CCECProcessor::SetStreamPath(uint16_t iStreamPath)
-{
- bool bReturn(false);
-
- CCECBusDevice *device = GetDeviceByPhysicalAddress(iStreamPath);
- if (device)
- {
- device->SetActiveDevice();
- bReturn = true;
- }
-
- return bReturn;
-}
-
bool CCECProcessor::TransmitInactiveSource(void)
{
if (!IsRunning())
for (uint8_t iPtr = 0; iPtr < 15; iPtr++)
if (m_logicalAddresses[iPtr])
{
- m_busDevices[iPtr]->SetInactiveDevice();
+ m_busDevices[iPtr]->SetInactiveSource();
m_busDevices[iPtr]->SetPhysicalAddress(iPhysicalAddress);
m_busDevices[iPtr]->TransmitPhysicalAddress();
}
return false;
}
-uint8_t CCECProcessor::VolumeUp(void)
+uint8_t CCECProcessor::VolumeUp(bool bSendRelease /* = true */)
{
uint8_t status = 0;
- if (IsActiveDevice(CECDEVICE_AUDIOSYSTEM))
- status = ((CCECAudioSystem *)m_busDevices[CECDEVICE_AUDIOSYSTEM])->VolumeUp();
+ if (IsPresentDevice(CECDEVICE_AUDIOSYSTEM))
+ status = ((CCECAudioSystem *)m_busDevices[CECDEVICE_AUDIOSYSTEM])->VolumeUp(bSendRelease);
return status;
}
-uint8_t CCECProcessor::VolumeDown(void)
+uint8_t CCECProcessor::VolumeDown(bool bSendRelease /* = true */)
{
uint8_t status = 0;
- if (IsActiveDevice(CECDEVICE_AUDIOSYSTEM))
- status = ((CCECAudioSystem *)m_busDevices[CECDEVICE_AUDIOSYSTEM])->VolumeDown();
+ if (IsPresentDevice(CECDEVICE_AUDIOSYSTEM))
+ status = ((CCECAudioSystem *)m_busDevices[CECDEVICE_AUDIOSYSTEM])->VolumeDown(bSendRelease);
return status;
}
-uint8_t CCECProcessor::MuteAudio(void)
+uint8_t CCECProcessor::MuteAudio(bool bSendRelease /* = true */)
{
uint8_t status = 0;
- if (IsActiveDevice(CECDEVICE_AUDIOSYSTEM))
- status = ((CCECAudioSystem *)m_busDevices[CECDEVICE_AUDIOSYSTEM])->MuteAudio();
+ if (IsPresentDevice(CECDEVICE_AUDIOSYSTEM))
+ status = ((CCECAudioSystem *)m_busDevices[CECDEVICE_AUDIOSYSTEM])->MuteAudio(bSendRelease);
return status;
}
LogOutput(data);
CCECAdapterMessage *output = new CCECAdapterMessage(data);
+
+ /* set the number of retries */
+ if (data.opcode == CEC_OPCODE_NONE)
+ output->maxTries = 1;
+ else if (data.initiator != CECDEVICE_BROADCAST)
+ output->maxTries = m_busDevices[data.initiator]->GetHandler()->GetTransmitRetries() + 1;
+
bReturn = Transmit(output);
/* set to "not present" on failed ack */
return addresses;
}
-bool CCECProcessor::IsActiveDevice(cec_logical_address address)
+bool CCECProcessor::IsPresentDevice(cec_logical_address address)
{
return m_busDevices[address]->GetStatus() == CEC_DEVICE_STATUS_PRESENT;
}
-bool CCECProcessor::IsActiveDeviceType(cec_device_type type)
+bool CCECProcessor::IsPresentDeviceType(cec_device_type type)
{
for (unsigned int iPtr = 0; iPtr < 15; iPtr++)
{
return bReturn;
}
-bool CCECProcessor::TransmitKeypress(cec_logical_address iDestination, cec_user_control_code key)
+bool CCECProcessor::TransmitKeypress(cec_logical_address iDestination, cec_user_control_code key, bool bWait /* = true */)
{
return m_busDevices[iDestination]->TransmitKeypress(key);
}
-bool CCECProcessor::TransmitKeyRelease(cec_logical_address iDestination)
+bool CCECProcessor::TransmitKeyRelease(cec_logical_address iDestination, bool bWait /* = true */)
{
return m_busDevices[iDestination]->TransmitKeyRelease();
}
while (!IsStopped())
{
- if (++iCounter < 30)
+ if (++iCounter < 10)
{
Sleep(1000);
continue;
if (IsStopped())
return;
- int64_t iWaitTime = 3000 - (GetTimeMs() - m_processor->GetLastTransmission());
+ int32_t iWaitTime = 3000 - (int32_t)(GetTimeMs() - m_processor->GetLastTransmission());
while (iWaitTime > 0)
{
Sleep(iWaitTime);
- iWaitTime = 3000 - (GetTimeMs() - m_processor->GetLastTransmission());
+ iWaitTime = 3000 - (int32_t)(GetTimeMs() - m_processor->GetLastTransmission());
}
}