using namespace CEC;
+#define ToString(p) CCECCommandHandler::ToString(p)
+
CCECBusDevice::CCECBusDevice(CCECProcessor *processor, cec_logical_address iLogicalAddress, uint16_t iPhysicalAddress) :
+ m_type(CEC_DEVICE_TYPE_RESERVED),
m_iPhysicalAddress(iPhysicalAddress),
m_iStreamPath(0),
m_iLogicalAddress(iLogicalAddress),
m_powerStatus(CEC_POWER_STATUS_UNKNOWN),
m_processor(processor),
- m_bMenuActive(true),
+ m_vendor(CEC_VENDOR_UNKNOWN),
+ m_menuState(CEC_MENU_STATE_ACTIVATED),
m_bActiveSource(false),
- m_iVendorClass(CEC_VENDOR_UNKNOWN),
m_iLastCommandSent(0),
m_iLastActive(0),
- m_cecVersion(CEC_VERSION_UNKNOWN)
+ m_cecVersion(CEC_VERSION_UNKNOWN),
+ m_deviceStatus(CEC_DEVICE_STATUS_UNKNOWN)
{
m_handler = new CCECCommandHandler(this);
m_menuLanguage.language[3] = 0;
m_menuLanguage.device = iLogicalAddress;
- m_vendor.vendor = CEC_VENDOR_UNKNOWN;
- m_type = CEC_DEVICE_TYPE_RESERVED;
- m_strDeviceName = CCECCommandHandler::ToString(m_iLogicalAddress);
+ m_strDeviceName = ToString(m_iLogicalAddress);
}
CCECBusDevice::~CCECBusDevice(void)
bool CCECBusDevice::HandleCommand(const cec_command &command)
{
- CLockObject lock(&m_mutex);
+ CLockObject lock(&m_transmitMutex);
m_iLastActive = GetTimeMs();
m_handler->HandleCommand(command);
m_condition.Signal();
void CCECBusDevice::PollVendorId(void)
{
- CLockObject lock(&m_mutex);
+ CLockObject lock(&m_transmitMutex);
if (m_iLastActive > 0 && m_iLogicalAddress != CECDEVICE_BROADCAST &&
- m_vendor.vendor == CEC_VENDOR_UNKNOWN &&
+ m_vendor == CEC_VENDOR_UNKNOWN &&
GetTimeMs() - m_iLastCommandSent > 5000 &&
!m_processor->IsMonitoring())
{
m_iLastCommandSent = GetTimeMs();
cec_command command;
- cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
+ cec_command::Format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
if (m_processor->Transmit(command))
- m_condition.Wait(&m_mutex, 1000);
+ m_condition.Wait(&m_transmitMutex, 1000);
}
}
SetPowerStatus(CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON);
cec_command command;
- cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_IMAGE_VIEW_ON);
+ cec_command::Format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_IMAGE_VIEW_ON);
return m_processor->Transmit(command);
}
AddLog(CEC_LOG_DEBUG, strLog.c_str());
cec_command command;
- cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_STANDBY);
+ cec_command::Format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_STANDBY);
return m_processor->Transmit(command);
}
//@{
cec_version CCECBusDevice::GetCecVersion(void)
{
+ CLockObject lock(&m_mutex);
if (m_cecVersion == CEC_VERSION_UNKNOWN)
{
- if (!MyLogicalAddressContains(m_iLogicalAddress))
- {
- CStdString strLog;
- strLog.Format("<< requesting CEC version of '%s' (%X)", GetLogicalAddressName(), m_iLogicalAddress);
- AddLog(CEC_LOG_NOTICE, strLog);
- cec_command command;
- cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GET_CEC_VERSION);
- CLockObject lock(&m_mutex);
- if (m_processor->Transmit(command))
- m_condition.Wait(&m_mutex, 1000);
- }
+ lock.Leave();
+ RequestCecVersion();
+ lock.Lock();
}
return m_cecVersion;
}
+bool CCECBusDevice::RequestCecVersion(void)
+{
+ bool bReturn(false);
+ if (!MyLogicalAddressContains(m_iLogicalAddress))
+ {
+ CStdString strLog;
+ strLog.Format("<< requesting CEC version of '%s' (%X)", GetLogicalAddressName(), m_iLogicalAddress);
+ AddLog(CEC_LOG_NOTICE, strLog);
+ cec_command command;
+ cec_command::Format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GET_CEC_VERSION);
+ CLockObject lock(&m_transmitMutex);
+ if (m_processor->Transmit(command))
+ bReturn = m_condition.Wait(&m_transmitMutex, 1000);
+ }
+ return bReturn;
+}
+
const char* CCECBusDevice::GetLogicalAddressName(void) const
{
- return CCECCommandHandler::ToString(m_iLogicalAddress);
+ return ToString(m_iLogicalAddress);
}
cec_menu_language &CCECBusDevice::GetMenuLanguage(void)
{
+ CLockObject lock(&m_mutex);
if (!strcmp(m_menuLanguage.language, "???"))
{
- if (!MyLogicalAddressContains(m_iLogicalAddress))
- {
- CStdString strLog;
- strLog.Format("<< requesting menu language of '%s' (%X)", GetLogicalAddressName(), m_iLogicalAddress);
- AddLog(CEC_LOG_NOTICE, strLog);
- cec_command command;
- cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GET_MENU_LANGUAGE);
- CLockObject lock(&m_mutex);
- if (m_processor->Transmit(command))
- m_condition.Wait(&m_mutex, 1000);
- }
+ lock.Leave();
+ RequestMenuLanguage();
+ lock.Lock();
}
-
return m_menuLanguage;
}
+bool CCECBusDevice::RequestMenuLanguage(void)
+{
+ bool bReturn(false);
+ if (!MyLogicalAddressContains(m_iLogicalAddress))
+ {
+ CStdString strLog;
+ strLog.Format("<< requesting menu language of '%s' (%X)", GetLogicalAddressName(), m_iLogicalAddress);
+ AddLog(CEC_LOG_NOTICE, strLog);
+ cec_command command;
+ cec_command::Format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GET_MENU_LANGUAGE);
+ CLockObject lock(&m_transmitMutex);
+ if (m_processor->Transmit(command))
+ bReturn = m_condition.Wait(&m_transmitMutex, 1000);
+ }
+ return bReturn;
+}
+
cec_logical_address CCECBusDevice::GetMyLogicalAddress(void) const
{
return m_processor->GetLogicalAddress();
cec_power_status CCECBusDevice::GetPowerStatus(void)
{
+ CLockObject lock(&m_mutex);
if (m_powerStatus == CEC_POWER_STATUS_UNKNOWN)
{
- if (!MyLogicalAddressContains(m_iLogicalAddress))
- {
- CStdString strLog;
- strLog.Format("<< requesting power status of '%s' (%X)", GetLogicalAddressName(), m_iLogicalAddress);
- AddLog(CEC_LOG_NOTICE, strLog);
- cec_command command;
- cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GIVE_DEVICE_POWER_STATUS);
- CLockObject lock(&m_mutex);
- if (m_processor->Transmit(command))
- m_condition.Wait(&m_mutex, 1000);
- }
+ lock.Leave();
+ RequestPowerStatus();
+ lock.Lock();
}
-
return m_powerStatus;
}
-const cec_vendor &CCECBusDevice::GetVendor(void)
+bool CCECBusDevice::RequestPowerStatus(void)
{
- if (m_vendor.vendor == CEC_VENDOR_UNKNOWN)
+ bool bReturn(false);
+ if (!MyLogicalAddressContains(m_iLogicalAddress))
{
- if (!MyLogicalAddressContains(m_iLogicalAddress))
- {
- CStdString strLog;
- strLog.Format("<< requesting vendor ID of '%s' (%X)", GetLogicalAddressName(), m_iLogicalAddress);
- AddLog(CEC_LOG_NOTICE, strLog);
- cec_command command;
- cec_command::format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
- CLockObject lock(&m_mutex);
-
- if (m_processor->Transmit(command))
- m_condition.Wait(&m_mutex, 1000);
- }
+ CStdString strLog;
+ strLog.Format("<< requesting power status of '%s' (%X)", GetLogicalAddressName(), m_iLogicalAddress);
+ AddLog(CEC_LOG_NOTICE, strLog);
+ cec_command command;
+ cec_command::Format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GIVE_DEVICE_POWER_STATUS);
+ CLockObject lock(&m_transmitMutex);
+ if (m_processor->Transmit(command))
+ bReturn = m_condition.Wait(&m_transmitMutex, 1000);
}
+ return bReturn;
+}
+cec_vendor_id CCECBusDevice::GetVendorId(void)
+{
+ CLockObject lock(&m_mutex);
+ if (m_vendor == CEC_VENDOR_UNKNOWN)
+ {
+ lock.Leave();
+ RequestVendorId();
+ lock.Lock();
+ }
return m_vendor;
}
+bool CCECBusDevice::RequestVendorId(void)
+{
+ bool bReturn(false);
+ if (!MyLogicalAddressContains(m_iLogicalAddress))
+ {
+ CStdString strLog;
+ strLog.Format("<< requesting vendor ID of '%s' (%X)", GetLogicalAddressName(), m_iLogicalAddress);
+ AddLog(CEC_LOG_NOTICE, strLog);
+ cec_command command;
+ cec_command::Format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
+
+ CLockObject lock(&m_transmitMutex);
+ if (m_processor->Transmit(command))
+ bReturn = m_condition.Wait(&m_transmitMutex, 1000);
+ }
+ return bReturn;
+}
+
+const char *CCECBusDevice::GetVendorName(void)
+{
+ return ToString(GetVendorId());
+}
+
bool CCECBusDevice::MyLogicalAddressContains(cec_logical_address address) const
{
return m_processor->HasLogicalAddress(address);
}
+cec_bus_device_status CCECBusDevice::GetStatus(void)
+{
+ CLockObject lock(&m_mutex);
+ if (m_deviceStatus == CEC_DEVICE_STATUS_UNKNOWN)
+ {
+ if (m_processor->PollDevice(m_iLogicalAddress))
+ m_deviceStatus = CEC_DEVICE_STATUS_PRESENT;
+ else
+ m_deviceStatus = CEC_DEVICE_STATUS_NOT_PRESENT;
+ }
+
+ return m_deviceStatus;
+}
+
//@}
/** @name Setters */
//@{
void CCECBusDevice::SetCecVersion(const cec_version newVersion)
{
- CStdString strLog;
m_cecVersion = newVersion;
- switch (newVersion)
- {
- case CEC_VERSION_1_2:
- strLog.Format("%s (%X): CEC version 1.2", GetLogicalAddressName(), m_iLogicalAddress);
- break;
- case CEC_VERSION_1_2A:
- strLog.Format("%s (%X): CEC version 1.2a", GetLogicalAddressName(), m_iLogicalAddress);
- break;
- case CEC_VERSION_1_3:
- strLog.Format("%s (%X): CEC version 1.3", GetLogicalAddressName(), m_iLogicalAddress);
- break;
- case CEC_VERSION_1_3A:
- strLog.Format("%s (%X): CEC version 1.3a", GetLogicalAddressName(), m_iLogicalAddress);
- break;
- default:
- strLog.Format("%s (%X): unknown CEC version", GetLogicalAddressName(), m_iLogicalAddress);
- m_cecVersion = CEC_VERSION_UNKNOWN;
- break;
- }
+ CStdString strLog;
+ strLog.Format("%s (%X): CEC version %s", GetLogicalAddressName(), m_iLogicalAddress, ToString(newVersion));
AddLog(CEC_LOG_DEBUG, strLog);
}
void CCECBusDevice::SetMenuLanguage(const cec_menu_language &language)
{
+ CLockObject lock(&m_mutex);
if (language.device == m_iLogicalAddress)
{
CStdString strLog;
}
}
+void CCECBusDevice::SetOSDName(CStdString strName)
+{
+ CLockObject lock(&m_mutex);
+ if (m_strDeviceName != strName)
+ {
+ CStdString strLog;
+ strLog.Format(">> %s (%X): osd name set to '%s'", GetLogicalAddressName(), m_iLogicalAddress, strName);
+ m_processor->AddLog(CEC_LOG_DEBUG, strLog);
+ m_strDeviceName = strName;
+ }
+}
+
+void CCECBusDevice::SetMenuState(const cec_menu_state state)
+{
+ CLockObject lock(&m_mutex);
+ if (m_menuState != state)
+ {
+ CStdString strLog;
+ strLog.Format(">> %s (%X): menu state set to '%s'", GetLogicalAddressName(), m_iLogicalAddress, ToString(m_menuState));
+ m_processor->AddLog(CEC_LOG_DEBUG, strLog);
+ m_menuState = state;
+ }
+}
+
+void CCECBusDevice::SetInactiveDevice(void)
+{
+ CLockObject lock(&m_mutex);
+ m_bActiveSource = false;
+}
+
+void CCECBusDevice::SetActiveDevice(void)
+{
+ CLockObject lock(&m_mutex);
+
+ for (int iPtr = 0; iPtr < 16; iPtr++)
+ if (iPtr != m_iLogicalAddress)
+ m_processor->m_busDevices[iPtr]->SetInactiveDevice();
+
+ m_bActiveSource = true;
+ m_powerStatus = CEC_POWER_STATUS_ON;
+}
+
+bool CCECBusDevice::TryLogicalAddress(void)
+{
+ CStdString strLog;
+ strLog.Format("trying logical address '%s'", GetLogicalAddressName());
+ AddLog(CEC_LOG_DEBUG, strLog);
+
+ m_processor->SetAckMask(0x1 << m_iLogicalAddress);
+ if (!TransmitPoll(m_iLogicalAddress))
+ {
+ strLog.Format("using logical address '%s'", GetLogicalAddressName());
+ AddLog(CEC_LOG_NOTICE, strLog);
+ SetDeviceStatus(CEC_DEVICE_STATUS_HANDLED_BY_LIBCEC);
+
+ return true;
+ }
+
+ strLog.Format("logical address '%s' already taken", GetLogicalAddressName());
+ AddLog(CEC_LOG_DEBUG, strLog);
+ SetDeviceStatus(CEC_DEVICE_STATUS_PRESENT);
+ return false;
+}
+
+void CCECBusDevice::SetDeviceStatus(const cec_bus_device_status newStatus)
+{
+ CLockObject lock(&m_mutex);
+ switch (newStatus)
+ {
+ case CEC_DEVICE_STATUS_UNKNOWN:
+ m_iStreamPath = 0;
+ m_powerStatus = CEC_POWER_STATUS_UNKNOWN;
+ m_vendor = CEC_VENDOR_UNKNOWN;
+ m_menuState = CEC_MENU_STATE_ACTIVATED;
+ m_bActiveSource = false;
+ m_iLastCommandSent = 0;
+ m_iLastActive = 0;
+ m_cecVersion = CEC_VERSION_UNKNOWN;
+ m_deviceStatus = newStatus;
+ break;
+ case CEC_DEVICE_STATUS_HANDLED_BY_LIBCEC:
+ m_iStreamPath = 0;
+ m_powerStatus = CEC_POWER_STATUS_ON;
+ m_vendor = CEC_VENDOR_UNKNOWN;
+ m_menuState = CEC_MENU_STATE_ACTIVATED;
+ m_bActiveSource = false;
+ m_iLastCommandSent = 0;
+ m_iLastActive = 0;
+ m_cecVersion = CEC_VERSION_1_3A;
+ m_deviceStatus = newStatus;
+ break;
+ case CEC_DEVICE_STATUS_PRESENT:
+ case CEC_DEVICE_STATUS_NOT_PRESENT:
+ m_deviceStatus = newStatus;
+ break;
+ }
+}
+
void CCECBusDevice::SetPhysicalAddress(uint16_t iNewAddress)
{
+ CLockObject lock(&m_mutex);
if (iNewAddress > 0)
{
CStdString strLog;
void CCECBusDevice::SetStreamPath(uint16_t iNewAddress, uint16_t iOldAddress /* = 0 */)
{
+ CLockObject lock(&m_mutex);
if (iNewAddress > 0)
{
CStdString strLog;
m_iStreamPath = iNewAddress;
if (iNewAddress > 0)
+ {
+ lock.Leave();
SetPowerStatus(CEC_POWER_STATUS_ON);
+ }
}
}
void CCECBusDevice::SetPowerStatus(const cec_power_status powerStatus)
{
+ CLockObject lock(&m_mutex);
if (m_powerStatus != powerStatus)
{
CStdString strLog;
- strLog.Format(">> %s (%X): power status changed from '%s' to '%s'", GetLogicalAddressName(), m_iLogicalAddress, CCECCommandHandler::ToString(m_powerStatus), CCECCommandHandler::ToString(powerStatus));
+ strLog.Format(">> %s (%X): power status changed from '%s' to '%s'", GetLogicalAddressName(), m_iLogicalAddress, ToString(m_powerStatus), ToString(powerStatus));
m_processor->AddLog(CEC_LOG_DEBUG, strLog);
m_powerStatus = powerStatus;
}
}
-void CCECBusDevice::SetVendorId(uint64_t iVendorId, uint8_t iVendorClass /* = 0 */)
+void CCECBusDevice::SetVendorId(uint64_t iVendorId)
{
- m_vendor.vendor = (cec_vendor_id)iVendorId;
- m_iVendorClass = iVendorClass;
-
- switch (iVendorId)
{
- case CEC_VENDOR_SAMSUNG:
- if (m_handler->GetVendorId() != CEC_VENDOR_SAMSUNG)
- {
- delete m_handler;
- m_handler = new CANCommandHandler(this);
- }
- break;
- case CEC_VENDOR_LG:
- if (m_handler->GetVendorId() != CEC_VENDOR_LG)
- {
- delete m_handler;
- m_handler = new CSLCommandHandler(this);
- }
- break;
- case CEC_VENDOR_PANASONIC:
- if (m_handler->GetVendorId() != CEC_VENDOR_PANASONIC)
- {
- delete m_handler;
- m_handler = new CVLCommandHandler(this);
- }
- break;
- default:
- if (m_handler->GetVendorId() != CEC_VENDOR_UNKNOWN)
+ CLockObject lock(&m_mutex);
+ m_vendor = (cec_vendor_id)iVendorId;
+
+ switch (iVendorId)
{
- delete m_handler;
- m_handler = new CCECCommandHandler(this);
+ case CEC_VENDOR_SAMSUNG:
+ if (m_handler->GetVendorId() != CEC_VENDOR_SAMSUNG)
+ {
+ delete m_handler;
+ m_handler = new CANCommandHandler(this);
+ }
+ break;
+ case CEC_VENDOR_LG:
+ if (m_handler->GetVendorId() != CEC_VENDOR_LG)
+ {
+ delete m_handler;
+ m_handler = new CSLCommandHandler(this);
+ }
+ break;
+ case CEC_VENDOR_PANASONIC:
+ if (m_handler->GetVendorId() != CEC_VENDOR_PANASONIC)
+ {
+ delete m_handler;
+ m_handler = new CVLCommandHandler(this);
+ }
+ break;
+ default:
+ if (m_handler->GetVendorId() != CEC_VENDOR_UNKNOWN)
+ {
+ delete m_handler;
+ m_handler = new CCECCommandHandler(this);
+ }
+ break;
}
- break;
}
CStdString strLog;
- strLog.Format("%s (%X): vendor = %s (%06x) class = %2x", GetLogicalAddressName(), m_iLogicalAddress, GetVendorName(), GetVendorId(), GetVendorClass());
+ strLog.Format("%s (%X): vendor = %s (%06x)", GetLogicalAddressName(), m_iLogicalAddress, GetVendorName(), m_vendor);
m_processor->AddLog(CEC_LOG_DEBUG, strLog.c_str());
}
//@}
//@{
bool CCECBusDevice::TransmitActiveSource(void)
{
+ CLockObject lock(&m_mutex);
if (m_powerStatus != CEC_POWER_STATUS_ON)
{
CStdString strLog;
AddLog(CEC_LOG_NOTICE, strLog);
cec_command command;
- cec_command::format(command, m_iLogicalAddress, CECDEVICE_BROADCAST, CEC_OPCODE_ACTIVE_SOURCE);
- command.parameters.push_back((uint8_t) ((m_iPhysicalAddress >> 8) & 0xFF));
- command.parameters.push_back((uint8_t) (m_iPhysicalAddress & 0xFF));
+ cec_command::Format(command, m_iLogicalAddress, CECDEVICE_BROADCAST, CEC_OPCODE_ACTIVE_SOURCE);
+ command.parameters.PushBack((uint8_t) ((m_iPhysicalAddress >> 8) & 0xFF));
+ command.parameters.PushBack((uint8_t) (m_iPhysicalAddress & 0xFF));
+ lock.Leave();
return m_processor->Transmit(command);
}
else
bool CCECBusDevice::TransmitCECVersion(cec_logical_address dest)
{
+ CLockObject lock(&m_mutex);
CStdString strLog;
- strLog.Format("<< %s (%X) -> %s (%X): cec version ", GetLogicalAddressName(), m_iLogicalAddress, CCECCommandHandler::ToString(dest), dest);
- switch (m_cecVersion)
- {
- case CEC_VERSION_1_2:
- strLog.append("1.2");
- break;
- case CEC_VERSION_1_2A:
- strLog.append("1.2a");
- break;
- case CEC_VERSION_1_3:
- strLog.append("1.3");
- break;
- case CEC_VERSION_1_3A:
- strLog.append("1.3a");
- break;
- default:
- strLog.append("unknown");
- break;
- }
+ strLog.Format("<< %s (%X) -> %s (%X): cec version %s", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest, ToString(m_cecVersion));
AddLog(CEC_LOG_NOTICE, strLog);
cec_command command;
- cec_command::format(command, m_iLogicalAddress, dest, CEC_OPCODE_CEC_VERSION);
- command.parameters.push_back((uint8_t)m_cecVersion);
+ cec_command::Format(command, m_iLogicalAddress, dest, CEC_OPCODE_CEC_VERSION);
+ command.parameters.PushBack((uint8_t)m_cecVersion);
+ lock.Leave();
return m_processor->Transmit(command);
}
AddLog(CEC_LOG_NOTICE, strLog);
cec_command command;
- cec_command::format(command, m_iLogicalAddress, CECDEVICE_BROADCAST, CEC_OPCODE_INACTIVE_SOURCE);
- command.parameters.push_back((m_iPhysicalAddress >> 8) & 0xFF);
- command.parameters.push_back(m_iPhysicalAddress & 0xFF);
+ cec_command::Format(command, m_iLogicalAddress, CECDEVICE_BROADCAST, CEC_OPCODE_INACTIVE_SOURCE);
+ command.parameters.PushBack((m_iPhysicalAddress >> 8) & 0xFF);
+ command.parameters.PushBack(m_iPhysicalAddress & 0xFF);
return m_processor->Transmit(command);
}
bool CCECBusDevice::TransmitMenuState(cec_logical_address dest)
{
CStdString strLog;
- strLog.Format("<< %s (%X) -> %s (%X): ", GetLogicalAddressName(), m_iLogicalAddress, CCECCommandHandler::ToString(dest), dest);
- if (m_bMenuActive)
- strLog.append("menu active");
- else
- strLog.append("menu inactive");
+ strLog.Format("<< %s (%X) -> %s (%X): menu state '%s'", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest, ToString(m_menuState));
AddLog(CEC_LOG_NOTICE, strLog);
cec_command command;
- cec_command::format(command, m_iLogicalAddress, dest, CEC_OPCODE_MENU_STATUS);
- command.parameters.push_back(m_bMenuActive ? (uint8_t) CEC_MENU_STATE_ACTIVATED : (uint8_t) CEC_MENU_STATE_DEACTIVATED);
+ cec_command::Format(command, m_iLogicalAddress, dest, CEC_OPCODE_MENU_STATUS);
+ command.parameters.PushBack((uint8_t)m_menuState);
return m_processor->Transmit(command);
}
bool CCECBusDevice::TransmitOSDName(cec_logical_address dest)
{
+ CLockObject lock(&m_mutex);
CStdString strLog;
- strLog.Format("<< %s (%X) -> %s (%X): OSD name '%s'", GetLogicalAddressName(), m_iLogicalAddress, CCECCommandHandler::ToString(dest), dest, m_strDeviceName.c_str());
+ strLog.Format("<< %s (%X) -> %s (%X): OSD name '%s'", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest, m_strDeviceName.c_str());
AddLog(CEC_LOG_NOTICE, strLog.c_str());
cec_command command;
- cec_command::format(command, m_iLogicalAddress, dest, CEC_OPCODE_SET_OSD_NAME);
+ cec_command::Format(command, m_iLogicalAddress, dest, CEC_OPCODE_SET_OSD_NAME);
for (unsigned int iPtr = 0; iPtr < m_strDeviceName.length(); iPtr++)
- command.parameters.push_back(m_strDeviceName.at(iPtr));
+ command.parameters.PushBack(m_strDeviceName.at(iPtr));
+ lock.Leave();
return m_processor->Transmit(command);
}
bool CCECBusDevice::TransmitOSDString(cec_logical_address dest, cec_display_control duration, const char *strMessage)
{
+ CLockObject lock(&m_mutex);
CStdString strLog;
- strLog.Format("<< %s (%X) -> %s (%X): display OSD message '%s'", GetLogicalAddressName(), m_iLogicalAddress, CCECCommandHandler::ToString(dest), dest, strMessage);
+ strLog.Format("<< %s (%X) -> %s (%X): display OSD message '%s'", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest, strMessage);
AddLog(CEC_LOG_NOTICE, strLog.c_str());
cec_command command;
- cec_command::format(command, m_iLogicalAddress, dest, CEC_OPCODE_SET_OSD_STRING);
- command.parameters.push_back((uint8_t)duration);
+ cec_command::Format(command, m_iLogicalAddress, dest, CEC_OPCODE_SET_OSD_STRING);
+ command.parameters.PushBack((uint8_t)duration);
unsigned int iLen = strlen(strMessage);
if (iLen > 13) iLen = 13;
for (unsigned int iPtr = 0; iPtr < iLen; iPtr++)
- command.parameters.push_back(strMessage[iPtr]);
+ command.parameters.PushBack(strMessage[iPtr]);
+ lock.Leave();
return m_processor->Transmit(command);
}
bool CCECBusDevice::TransmitPhysicalAddress(void)
{
+ CLockObject lock(&m_mutex);
CStdString strLog;
strLog.Format("<< %s (%X) -> broadcast (F): physical adddress %4x", GetLogicalAddressName(), m_iLogicalAddress, m_iPhysicalAddress);
AddLog(CEC_LOG_NOTICE, strLog.c_str());
cec_command command;
- cec_command::format(command, m_iLogicalAddress, CECDEVICE_BROADCAST, CEC_OPCODE_REPORT_PHYSICAL_ADDRESS);
- command.parameters.push_back((uint8_t) ((m_iPhysicalAddress >> 8) & 0xFF));
- command.parameters.push_back((uint8_t) (m_iPhysicalAddress & 0xFF));
- command.parameters.push_back((uint8_t) (m_type));
+ cec_command::Format(command, m_iLogicalAddress, CECDEVICE_BROADCAST, CEC_OPCODE_REPORT_PHYSICAL_ADDRESS);
+ command.parameters.PushBack((uint8_t) ((m_iPhysicalAddress >> 8) & 0xFF));
+ command.parameters.PushBack((uint8_t) (m_iPhysicalAddress & 0xFF));
+ command.parameters.PushBack((uint8_t) (m_type));
+ lock.Leave();
return m_processor->Transmit(command);
}
bool CCECBusDevice::TransmitPoll(cec_logical_address dest)
{
bool bReturn(false);
-
if (dest == CECDEVICE_UNKNOWN)
dest = m_iLogicalAddress;
CStdString strLog;
- strLog.Format("<< %s (%X) -> %s (%X): POLL", GetLogicalAddressName(), m_iLogicalAddress, CCECCommandHandler::ToString(dest), dest);
+ strLog.Format("<< %s (%X) -> %s (%X): POLL", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest);
AddLog(CEC_LOG_NOTICE, strLog.c_str());
cec_command command;
- cec_command::format(command, m_iLogicalAddress, dest, CEC_OPCODE_NONE);
- CLockObject lock(&m_mutex);
+ cec_command::Format(command, m_iLogicalAddress, dest, CEC_OPCODE_NONE);
+ CLockObject lock(&m_transmitMutex);
bReturn = m_processor->Transmit(command);
AddLog(CEC_LOG_DEBUG, bReturn ? ">> POLL sent" : ">> POLL not sent");
bool CCECBusDevice::TransmitPowerState(cec_logical_address dest)
{
+ CLockObject lock(&m_mutex);
CStdString strLog;
- strLog.Format("<< %s (%X) -> %s (%X): %s", GetLogicalAddressName(), m_iLogicalAddress, CCECCommandHandler::ToString(dest), dest, CCECCommandHandler::ToString(m_powerStatus));
+ strLog.Format("<< %s (%X) -> %s (%X): %s", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest, ToString(m_powerStatus));
AddLog(CEC_LOG_NOTICE, strLog.c_str());
cec_command command;
- cec_command::format(command, m_iLogicalAddress, dest, CEC_OPCODE_REPORT_POWER_STATUS);
- command.parameters.push_back((uint8_t) m_powerStatus);
+ cec_command::Format(command, m_iLogicalAddress, dest, CEC_OPCODE_REPORT_POWER_STATUS);
+ command.parameters.PushBack((uint8_t) m_powerStatus);
+ lock.Leave();
return m_processor->Transmit(command);
}
bool CCECBusDevice::TransmitVendorID(cec_logical_address dest)
{
- CStdString strLog;
- strLog.Format("<< %s (%X) -> %s (%X): vendor id feature abort", GetLogicalAddressName(), m_iLogicalAddress, CCECCommandHandler::ToString(dest), dest);
- AddLog(CEC_LOG_NOTICE, strLog);
+ CLockObject lock(&m_mutex);
+ if (m_vendor == CEC_VENDOR_UNKNOWN)
+ {
+ CStdString strLog;
+ strLog.Format("<< %s (%X) -> %s (%X): vendor id feature abort", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest);
+ AddLog(CEC_LOG_NOTICE, strLog);
- m_processor->TransmitAbort(dest, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
- return false;
+ lock.Leave();
+ m_processor->TransmitAbort(dest, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
+ return false;
+ }
+ else
+ {
+ CStdString strLog;
+ strLog.Format("<< %s (%X) -> %s (%X): vendor id %s (%x)", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest, ToString(m_vendor), (uint64_t)m_vendor);
+ AddLog(CEC_LOG_NOTICE, strLog);
+
+ cec_command command;
+ cec_command::Format(command, m_iLogicalAddress, CECDEVICE_BROADCAST, CEC_OPCODE_DEVICE_VENDOR_ID);
+
+ command.parameters.PushBack((uint8_t) (((uint64_t)m_vendor >> 16) & 0xFF));
+ command.parameters.PushBack((uint8_t) (((uint64_t)m_vendor >> 8) & 0xFF));
+ command.parameters.PushBack((uint8_t) ((uint64_t)m_vendor & 0xFF));
+
+ lock.Leave();
+ return m_processor->Transmit(command);
+ }
}
//@}
repositories / deb_libcec.git / blobdiff