CCECProcessor::CCECProcessor(CLibCEC *controller, const libcec_configuration *configuration) :
m_bInitialised(false),
- m_iPhysicalAddress(configuration->iPhysicalAddress),
- m_iHDMIPort(configuration->iHDMIPort),
- m_iBaseDevice(configuration->baseDevice),
- m_strDeviceName(configuration->strDeviceName),
- m_types(configuration->deviceTypes),
m_communication(NULL),
m_controller(controller),
m_bMonitor(false),
m_iStandardLineTimeout(3),
m_iRetryLineTimeout(3),
- m_iLastTransmission(0),
- m_clientVersion(configuration->clientVersion)
+ m_iLastTransmission(0)
{
m_logicalAddresses.Clear();
CreateBusDevices();
+ m_configuration.Clear();
+
+ SetConfiguration(configuration);
+
+ if (m_configuration.tvVendor != CEC_VENDOR_UNKNOWN)
+ m_busDevices[CECDEVICE_TV]->ReplaceHandler(false);
}
-CCECProcessor::CCECProcessor(CLibCEC *controller, const char *strDeviceName, const cec_device_type_list &types, uint16_t iPhysicalAddress, cec_client_version clientVersion) :
+CCECProcessor::CCECProcessor(CLibCEC *controller, const char *strDeviceName, const cec_device_type_list &types, uint16_t iPhysicalAddress) :
m_bInitialised(false),
- m_iPhysicalAddress(iPhysicalAddress),
- m_iHDMIPort(CEC_DEFAULT_HDMI_PORT),
- m_iBaseDevice((cec_logical_address)CEC_DEFAULT_BASE_DEVICE),
- m_strDeviceName(strDeviceName),
- m_types(types),
m_communication(NULL),
m_controller(controller),
m_bMonitor(false),
m_iStandardLineTimeout(3),
m_iRetryLineTimeout(3),
- m_iLastTransmission(0),
- m_clientVersion(clientVersion)
+ m_iLastTransmission(0)
{
+ m_configuration.Clear();
+
+ // client version < 1.5.0
+ m_configuration.clientVersion = CEC_CLIENT_VERSION_PRE_1_5;
+ snprintf(m_configuration.strDeviceName, 13, "%s", strDeviceName);
+ m_configuration.deviceTypes = types;
+ m_configuration.iPhysicalAddress = iPhysicalAddress;
+ m_configuration.baseDevice = (cec_logical_address)CEC_DEFAULT_BASE_DEVICE;
+ m_configuration.iHDMIPort = CEC_DEFAULT_HDMI_PORT;
+
+ if (m_configuration.deviceTypes.IsEmpty())
+ m_configuration.deviceTypes.Add(CEC_DEVICE_TYPE_RECORDING_DEVICE);
m_logicalAddresses.Clear();
CreateBusDevices();
}
}
if (bReturn)
- CLibCEC::AddLog(CEC_LOG_NOTICE, "connected to the CEC adapter. firmware version = %d, client version = %s", m_communication->GetFirmwareVersion(), ToString(m_clientVersion));
+ CLibCEC::AddLog(CEC_LOG_NOTICE, "connected to the CEC adapter. firmware version = %d, client version = %s", m_communication->GetFirmwareVersion(), ToString(m_configuration.clientVersion));
return bReturn;
}
}
/* only set our OSD name for the primary device */
- m_busDevices[m_logicalAddresses.primary]->m_strDeviceName = m_strDeviceName;
+ m_busDevices[m_logicalAddresses.primary]->m_strDeviceName = m_configuration.strDeviceName;
}
/* get the vendor id from the TV, so we are using the correct handler */
- m_busDevices[CECDEVICE_TV]->RequestVendorId();
+ m_busDevices[CECDEVICE_TV]->GetVendorId();
- if (m_iPhysicalAddress != 0)
+ if (m_configuration.iPhysicalAddress != 0)
{
- m_busDevices[m_logicalAddresses.primary]->m_iPhysicalAddress = m_iPhysicalAddress;
+ CLibCEC::AddLog(CEC_LOG_NOTICE, "setting the physical address to %4x", m_configuration.iPhysicalAddress);
+ m_busDevices[m_logicalAddresses.primary]->m_iPhysicalAddress = m_configuration.iPhysicalAddress;
if ((bReturn = m_busDevices[m_logicalAddresses.primary]->TransmitPhysicalAddress()) == false)
- CLibCEC::AddLog(CEC_LOG_ERROR, "unable to set the physical address to %4x", m_iPhysicalAddress);
+ CLibCEC::AddLog(CEC_LOG_ERROR, "unable to set the physical address to %4x", m_configuration.iPhysicalAddress);
}
- else if (m_iPhysicalAddress == 0 && (bReturn = SetHDMIPort(m_iBaseDevice, m_iHDMIPort, true)) == false)
- CLibCEC::AddLog(CEC_LOG_ERROR, "unable to set HDMI port %d on %s (%x)", m_iHDMIPort, ToString(m_iBaseDevice), (uint8_t)m_iBaseDevice);
+ else if (m_configuration.iPhysicalAddress == 0 && (bReturn = SetHDMIPort(m_configuration.baseDevice, m_configuration.iHDMIPort, true)) == false)
+ CLibCEC::AddLog(CEC_LOG_ERROR, "unable to set HDMI port %d on %s (%x)", m_configuration.iHDMIPort, ToString(m_configuration.baseDevice), (uint8_t)m_configuration.baseDevice);
SetInitialised(bReturn);
+ CLibCEC::ConfigurationChanged(m_configuration);
return bReturn;
}
for (unsigned int iPtr = 0; iPtr < 5; iPtr++)
{
- if (m_types.types[iPtr] == CEC_DEVICE_TYPE_RESERVED)
+ if (m_configuration.deviceTypes.types[iPtr] == CEC_DEVICE_TYPE_RESERVED)
continue;
- if (m_types.types[iPtr] == from)
+ if (m_configuration.deviceTypes.types[iPtr] == from)
{
bChanged = true;
- m_types.types[iPtr] = to;
+ m_configuration.deviceTypes.types[iPtr] = to;
}
- else if (m_types.types[iPtr] == to && bChanged)
+ else if (m_configuration.deviceTypes.types[iPtr] == to && bChanged)
{
- m_types.types[iPtr] = CEC_DEVICE_TYPE_RESERVED;
+ m_configuration.deviceTypes.types[iPtr] = CEC_DEVICE_TYPE_RESERVED;
}
}
bool bReturn(true);
m_logicalAddresses.Clear();
+ if (m_configuration.deviceTypes.IsEmpty())
+ {
+ CLibCEC::AddLog(CEC_LOG_ERROR, "no device types set");
+ return false;
+ }
+
for (unsigned int iPtr = 0; iPtr < 5; iPtr++)
{
- if (m_types.types[iPtr] == CEC_DEVICE_TYPE_RESERVED)
+ if (m_configuration.deviceTypes.types[iPtr] == CEC_DEVICE_TYPE_RESERVED)
continue;
- CLibCEC::AddLog(CEC_LOG_DEBUG, "%s - device %d: type %d", __FUNCTION__, iPtr, m_types.types[iPtr]);
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "%s - device %d: type %d", __FUNCTION__, iPtr, m_configuration.deviceTypes.types[iPtr]);
- if (m_types.types[iPtr] == CEC_DEVICE_TYPE_RECORDING_DEVICE)
+ if (m_configuration.deviceTypes.types[iPtr] == CEC_DEVICE_TYPE_RECORDING_DEVICE)
bReturn &= FindLogicalAddressRecordingDevice();
- if (m_types.types[iPtr] == CEC_DEVICE_TYPE_TUNER)
+ if (m_configuration.deviceTypes.types[iPtr] == CEC_DEVICE_TYPE_TUNER)
bReturn &= FindLogicalAddressTuner();
- if (m_types.types[iPtr] == CEC_DEVICE_TYPE_PLAYBACK_DEVICE)
+ if (m_configuration.deviceTypes.types[iPtr] == CEC_DEVICE_TYPE_PLAYBACK_DEVICE)
bReturn &= FindLogicalAddressPlaybackDevice();
- if (m_types.types[iPtr] == CEC_DEVICE_TYPE_AUDIO_SYSTEM)
+ if (m_configuration.deviceTypes.types[iPtr] == CEC_DEVICE_TYPE_AUDIO_SYSTEM)
bReturn &= FindLogicalAddressAudioSystem();
}
while (!IsStopped() && m_communication->IsOpen())
{
- ReplaceHandlers();
- if (m_commandBuffer.Pop(command))
- ParseCommand(command);
+ if (IsInitialised())
+ {
+ ReplaceHandlers();
+ if (m_commandBuffer.Pop(command))
+ ParseCommand(command);
- m_controller->CheckKeypressTimeout();
+ m_controller->CheckKeypressTimeout();
+ }
Sleep(5);
}
m_busDevices[addr]->SetActiveSource();
if (m_busDevices[addr]->GetPhysicalAddress(false) != 0xFFFF)
- {
- bReturn = m_busDevices[addr]->TransmitImageViewOn() &&
- m_busDevices[addr]->TransmitActiveSource();
-
- if (bReturn)
- {
- m_busDevices[addr]->SetMenuState(CEC_MENU_STATE_ACTIVATED);
- m_busDevices[addr]->TransmitMenuState(CECDEVICE_TV);
- }
-
- if (bReturn && (m_busDevices[addr]->GetType() == CEC_DEVICE_TYPE_PLAYBACK_DEVICE ||
- m_busDevices[addr]->GetType() == CEC_DEVICE_TYPE_RECORDING_DEVICE) &&
- m_busDevices[addr]->GetHandler()->SendDeckStatusUpdateOnActiveSource())
- {
- bReturn = ((CCECPlaybackDevice *)m_busDevices[addr])->TransmitDeckStatus(CECDEVICE_TV);
- }
- }
+ bReturn = m_busDevices[addr]->ActivateSource();
return bReturn;
}
bool CCECProcessor::SetActiveView(void)
{
- return SetActiveSource(m_types.IsEmpty() ? CEC_DEVICE_TYPE_RESERVED : m_types[0]);
+ CLibCEC::AddLog(CEC_LOG_WARNING, "deprecated method %s called", __FUNCTION__);
+ return SetActiveSource(m_configuration.deviceTypes.IsEmpty() ? CEC_DEVICE_TYPE_RESERVED : m_configuration.deviceTypes[0]);
}
bool CCECProcessor::SetDeckControlMode(cec_deck_control_mode mode, bool bSendUpdate /* = true */)
bool CCECProcessor::SetHDMIPort(cec_logical_address iBaseDevice, uint8_t iPort, bool bForce /* = false */)
{
bool bReturn(false);
- CLockObject lock(m_mutex);
- m_iBaseDevice = iBaseDevice;
- m_iHDMIPort = iPort;
+ {
+ CLockObject lock(m_mutex);
+ m_configuration.baseDevice = iBaseDevice;
+ m_configuration.iHDMIPort = iPort;
+ m_configuration.bAutodetectAddress = false;
+ }
+
if (!IsRunning() && !bForce)
return true;
uint16_t iPhysicalAddress(0);
if (iBaseDevice > CECDEVICE_TV)
{
- lock.Unlock();
iPhysicalAddress = m_busDevices[iBaseDevice]->GetPhysicalAddress();
- lock.Lock();
}
if (iPhysicalAddress < 0xffff)
if (!bReturn)
CLibCEC::AddLog(CEC_LOG_ERROR, "failed to set the physical address");
else
- {
- lock.Unlock();
SetPhysicalAddress(iPhysicalAddress);
- }
return bReturn;
}
{
CLockObject lock(m_mutex);
- m_iPhysicalAddress = iPhysicalAddress;
+ m_configuration.iPhysicalAddress = iPhysicalAddress;
+ if (m_configuration.bAutodetectAddress)
+ {
+ m_configuration.baseDevice = CECDEVICE_UNKNOWN;
+ m_configuration.iHDMIPort = 0;
+ }
if (!m_logicalAddresses.IsEmpty())
{
if (bSendActiveView)
SetActiveView();
+ if (bReturn)
+ CLibCEC::ConfigurationChanged(m_configuration);
+
return bReturn;
}
bool CCECProcessor::Transmit(const cec_command &data)
{
+ if (m_logicalAddresses[(uint8_t)data.destination])
+ {
+ CLibCEC::AddLog(CEC_LOG_WARNING, "not sending data to myself!");
+ return false;
+ }
+
cec_adapter_message_state retVal(ADAPTER_MESSAGE_STATE_UNKNOWN);
{
CLockObject lock(m_mutex);
return m_busDevices[iDestination]->TransmitKeyRelease(bWait);
}
+bool CCECProcessor::EnablePhysicalAddressDetection(void)
+{
+ CLibCEC::AddLog(CEC_LOG_WARNING, "deprecated method %s called", __FUNCTION__);
+ uint16_t iPhysicalAddress = m_communication->GetPhysicalAddress();
+ if (iPhysicalAddress != 0)
+ {
+ m_configuration.bAutodetectAddress = 1;
+ m_configuration.iPhysicalAddress = iPhysicalAddress;
+ m_configuration.baseDevice = CECDEVICE_UNKNOWN;
+ m_configuration.iHDMIPort = 0;
+ return SetPhysicalAddress(iPhysicalAddress);
+ }
+ return false;
+}
+
+bool CCECProcessor::StandbyDevices(cec_logical_address address /* = CECDEVICE_BROADCAST */)
+{
+ if (address == CECDEVICE_BROADCAST && m_configuration.clientVersion >= CEC_CLIENT_VERSION_1_5_0)
+ {
+ bool bReturn(true);
+ for (uint8_t iPtr = 0; iPtr <= 0xF; iPtr++)
+ {
+ if (m_configuration.powerOffDevices[iPtr])
+ bReturn &= m_busDevices[iPtr]->Standby();
+ }
+ return bReturn;
+ }
+
+ return m_busDevices[address]->Standby();
+}
+
+bool CCECProcessor::PowerOnDevices(cec_logical_address address /* = CECDEVICE_BROADCAST */)
+{
+ if (address == CECDEVICE_BROADCAST && m_configuration.clientVersion >= CEC_CLIENT_VERSION_1_5_0)
+ {
+ bool bReturn(true);
+ for (uint8_t iPtr = 0; iPtr <= 0xF; iPtr++)
+ {
+ if (m_configuration.powerOffDevices[iPtr])
+ bReturn &= m_busDevices[iPtr]->PowerOn();
+ }
+ return bReturn;
+ }
+
+ return m_busDevices[address]->PowerOn();
+}
+
const char *CCECProcessor::ToString(const cec_device_type type)
{
switch (type)
return m_busDevices[CECDEVICE_TV]->GetHandler()->TransmitSetStreamPath(iPhysicalAddress);
}
+bool CCECProcessor::SetConfiguration(const libcec_configuration *configuration)
+{
+ bool bReinit(false);
+ CCECBusDevice *primary = IsRunning() ? GetPrimaryDevice() : NULL;
+ cec_device_type oldPrimaryType = primary ? primary->GetType() : CEC_DEVICE_TYPE_RECORDING_DEVICE;
+ m_configuration.clientVersion = configuration->clientVersion;
+
+ // client version 1.5.0
+
+ // device types
+ bool bDeviceTypeChanged = IsRunning () && m_configuration.deviceTypes != configuration->deviceTypes;
+ m_configuration.deviceTypes = configuration->deviceTypes;
+
+ // autodetect address
+ uint16_t iPhysicalAddress = IsRunning() && configuration->bAutodetectAddress ? m_communication->GetPhysicalAddress() : 0;
+ bool bPhysicalAutodetected = IsRunning() && configuration->bAutodetectAddress && iPhysicalAddress != m_configuration.iPhysicalAddress && iPhysicalAddress != 0;
+ if (bPhysicalAutodetected)
+ {
+ m_configuration.iPhysicalAddress = iPhysicalAddress;
+ m_configuration.bAutodetectAddress = true;
+ }
+ else
+ {
+ m_configuration.bAutodetectAddress = false;
+ }
+
+ // physical address
+ bool bPhysicalAddressChanged(false);
+ if (!bPhysicalAutodetected)
+ {
+ bPhysicalAddressChanged = IsRunning() && m_configuration.iPhysicalAddress != configuration->iPhysicalAddress;
+ m_configuration.iPhysicalAddress = configuration->iPhysicalAddress;
+ }
+
+ // base device
+ bool bHdmiPortChanged(false);
+ if (!bPhysicalAutodetected && !bPhysicalAddressChanged)
+ {
+ bHdmiPortChanged = IsRunning() && m_configuration.baseDevice != configuration->baseDevice;
+ m_configuration.baseDevice = configuration->baseDevice;
+ }
+ else
+ {
+ m_configuration.baseDevice = CECDEVICE_UNKNOWN;
+ }
+
+ // hdmi port
+ if (!bPhysicalAutodetected && !bPhysicalAddressChanged)
+ {
+ bHdmiPortChanged |= IsRunning() && m_configuration.iHDMIPort != configuration->iHDMIPort;
+ m_configuration.iHDMIPort = configuration->iHDMIPort;
+ }
+ else
+ {
+ m_configuration.iHDMIPort = 0;
+ }
+
+ bReinit = bPhysicalAddressChanged || bHdmiPortChanged || bDeviceTypeChanged || bPhysicalAutodetected;
+
+ // device name
+ snprintf(m_configuration.strDeviceName, 13, "%s", configuration->strDeviceName);
+ if (primary && !primary->GetOSDName().Equals(m_configuration.strDeviceName))
+ {
+ primary->SetOSDName(m_configuration.strDeviceName);
+ if (!bReinit && IsRunning())
+ primary->TransmitOSDName(CECDEVICE_TV);
+ }
+
+ // tv vendor id override
+ if (m_configuration.tvVendor != configuration->tvVendor)
+ {
+ m_configuration.tvVendor= configuration->tvVendor;
+ m_busDevices[CECDEVICE_TV]->SetVendorId((uint64_t)m_configuration.tvVendor);
+ }
+
+ // wake CEC devices
+ if (m_configuration.wakeDevices != configuration->wakeDevices)
+ {
+ m_configuration.wakeDevices = configuration->wakeDevices;
+ if (!bReinit && IsRunning())
+ PowerOnDevices();
+ }
+
+ // just copy these
+ m_configuration.bGetSettingsFromROM = configuration->bGetSettingsFromROM;
+ m_configuration.powerOffDevices = configuration->powerOffDevices;
+ m_configuration.bPowerOffScreensaver = configuration->bPowerOffScreensaver;
+ m_configuration.bPowerOffOnStandby = configuration->bPowerOffOnStandby;
+
+ // ensure that there is at least 1 device type set
+ if (m_configuration.deviceTypes.IsEmpty())
+ m_configuration.deviceTypes.Add(CEC_DEVICE_TYPE_RECORDING_DEVICE);
+
+ if (bReinit)
+ {
+ if (bDeviceTypeChanged)
+ return ChangeDeviceType(oldPrimaryType, m_configuration.deviceTypes[0]);
+ else if (bPhysicalAddressChanged)
+ return SetPhysicalAddress(m_configuration.iPhysicalAddress);
+ else
+ return SetHDMIPort(m_configuration.baseDevice, m_configuration.iHDMIPort);
+ }
+
+ return true;
+}
+
bool CCECProcessor::GetCurrentConfiguration(libcec_configuration *configuration)
{
- configuration->iPhysicalAddress = m_iPhysicalAddress;
- configuration->iHDMIPort = m_iHDMIPort;
- configuration->baseDevice = m_iBaseDevice;
- snprintf(configuration->strDeviceName, 13, "%s", m_strDeviceName.c_str());
- configuration->deviceTypes = m_types;
+ // client version 1.5.0
+ configuration->clientVersion = m_configuration.clientVersion;
+ snprintf(configuration->strDeviceName, 13, "%s", m_configuration.strDeviceName);
+ configuration->deviceTypes = m_configuration.deviceTypes;
+ configuration->bAutodetectAddress = m_configuration.bAutodetectAddress;
+ configuration->iPhysicalAddress = m_configuration.iPhysicalAddress;
+ configuration->baseDevice = m_configuration.baseDevice;
+ configuration->iHDMIPort = m_configuration.iHDMIPort;
+ configuration->tvVendor = m_configuration.tvVendor;
+ configuration->wakeDevices = m_configuration.wakeDevices;
+ configuration->bGetSettingsFromROM = m_configuration.bGetSettingsFromROM;
+ configuration->powerOffDevices = m_configuration.powerOffDevices;
+ configuration->bPowerOffScreensaver = m_configuration.bPowerOffScreensaver;
+ configuration->bPowerOffOnStandby = m_configuration.bPowerOffOnStandby;
+
return true;
}