switch(iPtr)
{
case CECDEVICE_AUDIOSYSTEM:
- m_busDevices[iPtr] = new CCECAudioSystem(this, (cec_logical_address) iPtr, 0);
+ m_busDevices[iPtr] = new CCECAudioSystem(this, (cec_logical_address) iPtr, 0xFFFF);
break;
case CECDEVICE_PLAYBACKDEVICE1:
case CECDEVICE_PLAYBACKDEVICE2:
case CECDEVICE_PLAYBACKDEVICE3:
- m_busDevices[iPtr] = new CCECPlaybackDevice(this, (cec_logical_address) iPtr, 0);
+ m_busDevices[iPtr] = new CCECPlaybackDevice(this, (cec_logical_address) iPtr, 0xFFFF);
break;
case CECDEVICE_RECORDINGDEVICE1:
case CECDEVICE_RECORDINGDEVICE2:
case CECDEVICE_RECORDINGDEVICE3:
- m_busDevices[iPtr] = new CCECRecordingDevice(this, (cec_logical_address) iPtr, 0);
+ m_busDevices[iPtr] = new CCECRecordingDevice(this, (cec_logical_address) iPtr, 0xFFFF);
break;
case CECDEVICE_TUNER1:
case CECDEVICE_TUNER2:
case CECDEVICE_TUNER3:
case CECDEVICE_TUNER4:
- m_busDevices[iPtr] = new CCECTuner(this, (cec_logical_address) iPtr, 0);
+ m_busDevices[iPtr] = new CCECTuner(this, (cec_logical_address) iPtr, 0xFFFF);
break;
case CECDEVICE_TV:
m_busDevices[iPtr] = new CCECTV(this, (cec_logical_address) iPtr, 0);
break;
default:
- m_busDevices[iPtr] = new CCECBusDevice(this, (cec_logical_address) iPtr, 0);
+ m_busDevices[iPtr] = new CCECBusDevice(this, (cec_logical_address) iPtr, 0xFFFF);
break;
}
}
AddLog(CEC_LOG_DEBUG, strLog);
SetAckMask(0x1 << address);
- if (!m_busDevices[address]->PollDevice(address))
+ if (!m_busDevices[address]->TransmitPoll(address))
{
strLog.Format("using logical address '%s'", strLabel);
AddLog(CEC_LOG_NOTICE, strLog);
if (m_logicalAddresses.empty())
m_busDevices[address]->m_strDeviceName = m_strDeviceName;
m_busDevices[address]->m_powerStatus = CEC_POWER_STATUS_ON;
+ m_busDevices[address]->m_cecVersion = CEC_VERSION_1_3A;
m_logicalAddresses.set(address);
// TODO
- m_busDevices[address]->SetPhysicalAddress(CEC_DEFAULT_PHYSICAL_ADDRESS + iIndex);
+ m_busDevices[address]->SetPhysicalAddress(CEC_DEFAULT_PHYSICAL_ADDRESS + (iIndex * 0x100));
return true;
}
return false;
if (!m_logicalAddresses.empty() && m_busDevices[m_logicalAddresses.primary])
- return m_busDevices[m_logicalAddresses.primary]->BroadcastActiveView();
+ return m_busDevices[m_logicalAddresses.primary]->TransmitActiveView();
return false;
}
return false;
if (!m_logicalAddresses.empty() && m_busDevices[m_logicalAddresses.primary])
- return m_busDevices[m_logicalAddresses.primary]->BroadcastInactiveView();
+ return m_busDevices[m_logicalAddresses.primary]->TransmitInactiveView();
return false;
}
if (!m_logicalAddresses.empty() && m_busDevices[m_logicalAddresses.primary])
{
m_busDevices[m_logicalAddresses.primary]->SetPhysicalAddress(iPhysicalAddress);
- return m_busDevices[m_logicalAddresses.primary]->BroadcastActiveView();
+ return m_busDevices[m_logicalAddresses.primary]->TransmitActiveView();
}
return false;
}
bool CCECProcessor::PollDevice(cec_logical_address iAddress)
{
if (iAddress != CECDEVICE_UNKNOWN && m_busDevices[iAddress])
- return m_busDevices[iAddress]->PollDevice();
+ return m_busDevices[m_logicalAddresses.primary]->TransmitPoll(iAddress);
return false;
}
if (output->transmit_timeout > 0)
{
if ((bReturn = WaitForTransmitSucceeded(output->size(), output->transmit_timeout)) == false)
- m_controller->AddLog(CEC_LOG_ERROR, "did not receive ack");
+ m_controller->AddLog(CEC_LOG_DEBUG, "did not receive ack");
}
else
bReturn = true;