X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fdevices%2FCECBusDevice.cpp;h=7fe92a451236ec893e89ef47fd213e5ae164fb56;hb=9bc8934c6dac8efcd2f636b6f68798049f84deac;hp=1227f8d749c6515f193bcd64fd3bb3fce8042ffd;hpb=15d1a84cf1eeaa80ab27ec3f48390073ca2ded75;p=deb_libcec.git diff --git a/src/lib/devices/CECBusDevice.cpp b/src/lib/devices/CECBusDevice.cpp index 1227f8d..7fe92a4 100644 --- a/src/lib/devices/CECBusDevice.cpp +++ b/src/lib/devices/CECBusDevice.cpp @@ -40,7 +40,7 @@ using namespace CEC; -#define ToString(p) CCECCommandHandler::ToString(p) +#define ToString(p) m_processor->ToString(p) CCECBusDevice::CCECBusDevice(CCECProcessor *processor, cec_logical_address iLogicalAddress, uint16_t iPhysicalAddress) : m_type(CEC_DEVICE_TYPE_RESERVED), @@ -54,7 +54,8 @@ CCECBusDevice::CCECBusDevice(CCECProcessor *processor, cec_logical_address iLogi m_bActiveSource(false), 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); @@ -82,49 +83,36 @@ bool CCECBusDevice::HandleCommand(const cec_command &command) CLockObject lock(&m_transmitMutex); m_iLastActive = GetTimeMs(); m_handler->HandleCommand(command); + if (m_deviceStatus != CEC_DEVICE_STATUS_HANDLED_BY_LIBCEC) + m_deviceStatus = CEC_DEVICE_STATUS_PRESENT; m_condition.Signal(); return true; } -void CCECBusDevice::PollVendorId(void) -{ - CLockObject lock(&m_transmitMutex); - if (m_iLastActive > 0 && m_iLogicalAddress != CECDEVICE_BROADCAST && - m_vendor == CEC_VENDOR_UNKNOWN && - GetTimeMs() - m_iLastCommandSent > 5000 && - !m_processor->IsMonitoring()) - { - CStdString strLog; - strLog.Format("<< requesting vendor ID of '%s' (%X)", GetLogicalAddressName(), m_iLogicalAddress); - AddLog(CEC_LOG_NOTICE, strLog); - m_iLastCommandSent = GetTimeMs(); - - cec_command command; - cec_command::Format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID); - if (m_processor->Transmit(command)) - m_condition.Wait(&m_transmitMutex, 1000); - } -} - bool CCECBusDevice::PowerOn(void) { - cec_power_status current = GetPowerStatus(); - if (current != CEC_POWER_STATUS_ON && - current != CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON) - { - CStdString strLog; - strLog.Format("<< powering on '%s' (%X)", GetLogicalAddressName(), m_iLogicalAddress); - AddLog(CEC_LOG_DEBUG, strLog.c_str()); - - SetPowerStatus(CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON); - - cec_command command; - cec_command::Format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_IMAGE_VIEW_ON); + CStdString strLog; + strLog.Format("<< powering on '%s' (%X)", GetLogicalAddressName(), m_iLogicalAddress); + AddLog(CEC_LOG_DEBUG, strLog.c_str()); - return m_processor->Transmit(command); + cec_command command; + cec_command::Format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_IMAGE_VIEW_ON); + if (m_processor->Transmit(command)) + { + { + CLockObject lock(&m_mutex); + m_powerStatus = CEC_POWER_STATUS_UNKNOWN; + } + cec_power_status status = GetPowerStatus(); + if (status == CEC_POWER_STATUS_STANDBY || status == CEC_POWER_STATUS_UNKNOWN) + { + SendKeypress(CEC_USER_CONTROL_CODE_POWER, true); + return SendKeyRelease(false); + } + return true; } - return true; + return false; } bool CCECBusDevice::Standby(void) @@ -143,6 +131,17 @@ bool CCECBusDevice::Standby(void) //@{ cec_version CCECBusDevice::GetCecVersion(void) { + CLockObject lock(&m_mutex); + if (GetStatus() == CEC_DEVICE_STATUS_PRESENT && + m_cecVersion == CEC_VERSION_UNKNOWN) + RequestCecVersion(); + + return m_cecVersion; +} + +bool CCECBusDevice::RequestCecVersion(void) +{ + bool bReturn(false); if (!MyLogicalAddressContains(m_iLogicalAddress)) { CStdString strLog; @@ -152,11 +151,14 @@ cec_version CCECBusDevice::GetCecVersion(void) cec_command::Format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GET_CEC_VERSION); CLockObject lock(&m_transmitMutex); if (m_processor->Transmit(command)) - m_condition.Wait(&m_transmitMutex, 1000); + bReturn = m_condition.Wait(&m_transmitMutex, 1000); } + return bReturn; +} - CLockObject lock(&m_mutex); - return m_cecVersion; +uint64_t CCECBusDevice::GetLastCommandSent(void) const +{ + return GetTimeMs() - m_iLastCommandSent; } const char* CCECBusDevice::GetLogicalAddressName(void) const @@ -166,6 +168,17 @@ const char* CCECBusDevice::GetLogicalAddressName(void) const cec_menu_language &CCECBusDevice::GetMenuLanguage(void) { + CLockObject lock(&m_mutex); + if (GetStatus() == CEC_DEVICE_STATUS_PRESENT && + !strcmp(m_menuLanguage.language, "???")) + RequestMenuLanguage(); + + return m_menuLanguage; +} + +bool CCECBusDevice::RequestMenuLanguage(void) +{ + bool bReturn(false); if (!MyLogicalAddressContains(m_iLogicalAddress)) { CStdString strLog; @@ -175,11 +188,9 @@ cec_menu_language &CCECBusDevice::GetMenuLanguage(void) cec_command::Format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GET_MENU_LANGUAGE); CLockObject lock(&m_transmitMutex); if (m_processor->Transmit(command)) - m_condition.Wait(&m_transmitMutex, 1000); + bReturn = m_condition.Wait(&m_transmitMutex, 1000); } - - CLockObject lock(&m_mutex); - return m_menuLanguage; + return bReturn; } cec_logical_address CCECBusDevice::GetMyLogicalAddress(void) const @@ -192,8 +203,76 @@ uint16_t CCECBusDevice::GetMyPhysicalAddress(void) const return m_processor->GetPhysicalAddress(); } +CStdString CCECBusDevice::GetOSDName(void) +{ + CLockObject lock(&m_mutex); + if (GetStatus() == CEC_DEVICE_STATUS_PRESENT && + m_strDeviceName.Equals(ToString(m_iLogicalAddress))) + RequestOSDName(); + + return m_strDeviceName; +} + +bool CCECBusDevice::RequestOSDName(void) +{ + bool bReturn(false); + if (!MyLogicalAddressContains(m_iLogicalAddress)) + { + CStdString strLog; + strLog.Format("<< requesting OSD name of '%s' (%X)", GetLogicalAddressName(), m_iLogicalAddress); + AddLog(CEC_LOG_NOTICE, strLog); + cec_command command; + cec_command::Format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GIVE_OSD_NAME); + CLockObject lock(&m_transmitMutex); + if (m_processor->Transmit(command)) + bReturn = m_condition.Wait(&m_transmitMutex, 1000); + } + return bReturn; +} + +uint16_t CCECBusDevice::GetPhysicalAddress(bool bRefresh /* = true */) +{ + CLockObject lock(&m_mutex); + if (GetStatus() == CEC_DEVICE_STATUS_PRESENT && + (m_iPhysicalAddress == 0xFFFF || bRefresh)) + { + if (!RequestPhysicalAddress()) + AddLog(CEC_LOG_ERROR, "failed to request the physical address"); + } + + return m_iPhysicalAddress; +} + +bool CCECBusDevice::RequestPhysicalAddress(void) +{ + bool bReturn(false); + if (!MyLogicalAddressContains(m_iLogicalAddress)) + { + CStdString strLog; + strLog.Format("<< requesting physical address of '%s' (%X)", GetLogicalAddressName(), m_iLogicalAddress); + AddLog(CEC_LOG_NOTICE, strLog); + cec_command command; + cec_command::Format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GIVE_PHYSICAL_ADDRESS); + CLockObject lock(&m_transmitMutex); + if (m_processor->Transmit(command)) + bReturn = m_condition.Wait(&m_transmitMutex, 1000); + } + return bReturn; +} + cec_power_status CCECBusDevice::GetPowerStatus(void) { + CLockObject lock(&m_mutex); + if (GetStatus() == CEC_DEVICE_STATUS_PRESENT && + m_powerStatus == CEC_POWER_STATUS_UNKNOWN) + RequestPowerStatus(); + + return m_powerStatus; +} + +bool CCECBusDevice::RequestPowerStatus(void) +{ + bool bReturn(false); if (!MyLogicalAddressContains(m_iLogicalAddress)) { CStdString strLog; @@ -203,15 +282,24 @@ cec_power_status CCECBusDevice::GetPowerStatus(void) cec_command::Format(command, GetMyLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_GIVE_DEVICE_POWER_STATUS); CLockObject lock(&m_transmitMutex); if (m_processor->Transmit(command)) - m_condition.Wait(&m_transmitMutex, 1000); + bReturn = m_condition.Wait(&m_transmitMutex, 1000); } + return bReturn; +} +cec_vendor_id CCECBusDevice::GetVendorId(void) +{ CLockObject lock(&m_mutex); - return m_powerStatus; + if (GetStatus() == CEC_DEVICE_STATUS_PRESENT && + m_vendor == CEC_VENDOR_UNKNOWN) + RequestVendorId(); + + return m_vendor; } -cec_vendor_id CCECBusDevice::GetVendorId(void) +bool CCECBusDevice::RequestVendorId(void) { + bool bReturn(false); if (!MyLogicalAddressContains(m_iLogicalAddress)) { CStdString strLog; @@ -219,20 +307,17 @@ cec_vendor_id CCECBusDevice::GetVendorId(void) 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); + CLockObject lock(&m_transmitMutex); if (m_processor->Transmit(command)) - m_condition.Wait(&m_transmitMutex, 1000); + bReturn = m_condition.Wait(&m_transmitMutex, 1000); } - - CLockObject lock(&m_mutex); - return m_vendor; + return bReturn; } const char *CCECBusDevice::GetVendorName(void) { - CLockObject lock(&m_mutex); - return ToString(m_vendor); + return ToString(GetVendorId()); } bool CCECBusDevice::MyLogicalAddressContains(cec_logical_address address) const @@ -240,6 +325,70 @@ bool CCECBusDevice::MyLogicalAddressContains(cec_logical_address address) const return m_processor->HasLogicalAddress(address); } +bool CCECBusDevice::NeedsPoll(void) +{ + bool bSendPoll(false); + switch (m_iLogicalAddress) + { + case CECDEVICE_PLAYBACKDEVICE3: + if (m_processor->m_busDevices[CECDEVICE_PLAYBACKDEVICE2]->GetStatus() == CEC_DEVICE_STATUS_PRESENT) + bSendPoll = true; + break; + case CECDEVICE_PLAYBACKDEVICE2: + if (m_processor->m_busDevices[CECDEVICE_PLAYBACKDEVICE1]->GetStatus() == CEC_DEVICE_STATUS_PRESENT) + bSendPoll = true; + break; + case CECDEVICE_RECORDINGDEVICE3: + if (m_processor->m_busDevices[CECDEVICE_RECORDINGDEVICE2]->GetStatus() == CEC_DEVICE_STATUS_PRESENT) + bSendPoll = true; + break; + case CECDEVICE_RECORDINGDEVICE2: + if (m_processor->m_busDevices[CECDEVICE_RECORDINGDEVICE1]->GetStatus() == CEC_DEVICE_STATUS_PRESENT) + bSendPoll = true; + break; + case CECDEVICE_TUNER4: + if (m_processor->m_busDevices[CECDEVICE_TUNER3]->GetStatus() == CEC_DEVICE_STATUS_PRESENT) + bSendPoll = true; + break; + case CECDEVICE_TUNER3: + if (m_processor->m_busDevices[CECDEVICE_TUNER2]->GetStatus() == CEC_DEVICE_STATUS_PRESENT) + bSendPoll = true; + break; + case CECDEVICE_TUNER2: + if (m_processor->m_busDevices[CECDEVICE_TUNER1]->GetStatus() == CEC_DEVICE_STATUS_PRESENT) + bSendPoll = true; + break; + case CECDEVICE_AUDIOSYSTEM: + case CECDEVICE_PLAYBACKDEVICE1: + case CECDEVICE_RECORDINGDEVICE1: + case CECDEVICE_TUNER1: + case CECDEVICE_TV: + bSendPoll = true; + break; + default: + break; + } + + return bSendPoll; +} + +cec_bus_device_status CCECBusDevice::GetStatus(bool bForcePoll /* = false */) +{ + CLockObject lock(&m_writeMutex); + if (m_deviceStatus == CEC_DEVICE_STATUS_UNKNOWN || bForcePoll) + { + lock.Leave(); + bool bPollAcked(false); + if (bForcePoll || NeedsPoll()) + bPollAcked = m_processor->PollDevice(m_iLogicalAddress); + + lock.Lock(); + m_deviceStatus = bPollAcked ? CEC_DEVICE_STATUS_PRESENT : CEC_DEVICE_STATUS_NOT_PRESENT; + } + + return m_deviceStatus; +} + //@} /** @name Setters */ @@ -255,7 +404,7 @@ void CCECBusDevice::SetCecVersion(const cec_version newVersion) void CCECBusDevice::SetMenuLanguage(const cec_menu_language &language) { - CLockObject lock(&m_mutex); + CLockObject lock(&m_writeMutex); if (language.device == m_iLogicalAddress) { CStdString strLog; @@ -267,7 +416,7 @@ void CCECBusDevice::SetMenuLanguage(const cec_menu_language &language) void CCECBusDevice::SetOSDName(CStdString strName) { - CLockObject lock(&m_mutex); + CLockObject lock(&m_writeMutex); if (m_strDeviceName != strName) { CStdString strLog; @@ -279,7 +428,7 @@ void CCECBusDevice::SetOSDName(CStdString strName) void CCECBusDevice::SetMenuState(const cec_menu_state state) { - CLockObject lock(&m_mutex); + CLockObject lock(&m_writeMutex); if (m_menuState != state) { CStdString strLog; @@ -291,13 +440,13 @@ void CCECBusDevice::SetMenuState(const cec_menu_state state) void CCECBusDevice::SetInactiveDevice(void) { - CLockObject lock(&m_mutex); + CLockObject lock(&m_writeMutex); m_bActiveSource = false; } void CCECBusDevice::SetActiveDevice(void) { - CLockObject lock(&m_mutex); + CLockObject lock(&m_writeMutex); for (int iPtr = 0; iPtr < 16; iPtr++) if (iPtr != m_iLogicalAddress) @@ -307,10 +456,66 @@ void CCECBusDevice::SetActiveDevice(void) 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_writeMutex); + 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) + CLockObject lock(&m_writeMutex); + if (iNewAddress > 0 && m_iPhysicalAddress != iNewAddress) { CStdString strLog; strLog.Format(">> %s (%X): physical address changed from %04x to %04x", GetLogicalAddressName(), m_iLogicalAddress, m_iPhysicalAddress, iNewAddress); @@ -322,11 +527,11 @@ void CCECBusDevice::SetPhysicalAddress(uint16_t iNewAddress) void CCECBusDevice::SetStreamPath(uint16_t iNewAddress, uint16_t iOldAddress /* = 0 */) { - CLockObject lock(&m_mutex); + CLockObject lock(&m_writeMutex); if (iNewAddress > 0) { CStdString strLog; - strLog.Format(">> %s (%X): stream path changed from %04x to %04x", GetLogicalAddressName(), m_iLogicalAddress, iOldAddress, iNewAddress); + strLog.Format(">> %s (%X): stream path changed from %04x to %04x", GetLogicalAddressName(), m_iLogicalAddress, iOldAddress == 0 ? m_iStreamPath : iOldAddress, iNewAddress); AddLog(CEC_LOG_DEBUG, strLog.c_str()); m_iStreamPath = iNewAddress; @@ -341,7 +546,7 @@ void CCECBusDevice::SetStreamPath(uint16_t iNewAddress, uint16_t iOldAddress /* void CCECBusDevice::SetPowerStatus(const cec_power_status powerStatus) { - CLockObject lock(&m_mutex); + CLockObject lock(&m_writeMutex); if (m_powerStatus != powerStatus) { CStdString strLog; @@ -354,7 +559,7 @@ void CCECBusDevice::SetPowerStatus(const cec_power_status powerStatus) void CCECBusDevice::SetVendorId(uint64_t iVendorId) { { - CLockObject lock(&m_mutex); + CLockObject lock(&m_writeMutex); m_vendor = (cec_vendor_id)iVendorId; switch (iVendorId) @@ -391,7 +596,7 @@ void CCECBusDevice::SetVendorId(uint64_t iVendorId) } CStdString strLog; - strLog.Format("%s (%X): vendor = %s (%06x)", GetLogicalAddressName(), m_iLogicalAddress, GetVendorName(), m_vendor); + strLog.Format("%s (%X): vendor = %s (%06x)", GetLogicalAddressName(), m_iLogicalAddress, ToString(m_vendor), m_vendor); m_processor->AddLog(CEC_LOG_DEBUG, strLog.c_str()); } //@} @@ -400,7 +605,7 @@ void CCECBusDevice::SetVendorId(uint64_t iVendorId) //@{ bool CCECBusDevice::TransmitActiveSource(void) { - CLockObject lock(&m_mutex); + CLockObject lock(&m_writeMutex); if (m_powerStatus != CEC_POWER_STATUS_ON) { CStdString strLog; @@ -433,7 +638,7 @@ bool CCECBusDevice::TransmitActiveSource(void) bool CCECBusDevice::TransmitCECVersion(cec_logical_address dest) { - CLockObject lock(&m_mutex); + CLockObject lock(&m_writeMutex); CStdString strLog; strLog.Format("<< %s (%X) -> %s (%X): cec version %s", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest, ToString(m_cecVersion)); AddLog(CEC_LOG_NOTICE, strLog); @@ -446,14 +651,14 @@ bool CCECBusDevice::TransmitCECVersion(cec_logical_address dest) return m_processor->Transmit(command); } -bool CCECBusDevice::TransmitInactiveView(void) +bool CCECBusDevice::TransmitInactiveSource(void) { CStdString strLog; - strLog.Format("<< %s (%X) -> broadcast (F): inactive view", GetLogicalAddressName(), m_iLogicalAddress); + strLog.Format("<< %s (%X) -> broadcast (F): inactive source", GetLogicalAddressName(), m_iLogicalAddress); AddLog(CEC_LOG_NOTICE, strLog); cec_command command; - cec_command::Format(command, m_iLogicalAddress, CECDEVICE_BROADCAST, CEC_OPCODE_INACTIVE_SOURCE); + cec_command::Format(command, m_iLogicalAddress, CECDEVICE_TV, CEC_OPCODE_INACTIVE_SOURCE); command.parameters.PushBack((m_iPhysicalAddress >> 8) & 0xFF); command.parameters.PushBack(m_iPhysicalAddress & 0xFF); @@ -475,7 +680,7 @@ bool CCECBusDevice::TransmitMenuState(cec_logical_address dest) bool CCECBusDevice::TransmitOSDName(cec_logical_address dest) { - CLockObject lock(&m_mutex); + CLockObject lock(&m_writeMutex); CStdString strLog; 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()); @@ -491,7 +696,7 @@ bool CCECBusDevice::TransmitOSDName(cec_logical_address dest) bool CCECBusDevice::TransmitOSDString(cec_logical_address dest, cec_display_control duration, const char *strMessage) { - CLockObject lock(&m_mutex); + CLockObject lock(&m_writeMutex); CStdString strLog; strLog.Format("<< %s (%X) -> %s (%X): display OSD message '%s'", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest, strMessage); AddLog(CEC_LOG_NOTICE, strLog.c_str()); @@ -512,7 +717,7 @@ bool CCECBusDevice::TransmitOSDString(cec_logical_address dest, cec_display_cont bool CCECBusDevice::TransmitPhysicalAddress(void) { - CLockObject lock(&m_mutex); + CLockObject lock(&m_writeMutex); CStdString strLog; strLog.Format("<< %s (%X) -> broadcast (F): physical adddress %4x", GetLogicalAddressName(), m_iLogicalAddress, m_iPhysicalAddress); AddLog(CEC_LOG_NOTICE, strLog.c_str()); @@ -539,16 +744,26 @@ bool CCECBusDevice::TransmitPoll(cec_logical_address dest) cec_command command; cec_command::Format(command, m_iLogicalAddress, dest, CEC_OPCODE_NONE); - CLockObject lock(&m_transmitMutex); - bReturn = m_processor->Transmit(command); + { + CLockObject lock(&m_transmitMutex); + bReturn = m_processor->Transmit(command); + } + AddLog(CEC_LOG_DEBUG, bReturn ? ">> POLL sent" : ">> POLL not sent"); + + if (bReturn) + { + CLockObject lock(&m_writeMutex); + m_iLastActive = GetTimeMs(); + } + return bReturn; } bool CCECBusDevice::TransmitPowerState(cec_logical_address dest) { - CLockObject lock(&m_mutex); + CLockObject lock(&m_writeMutex); CStdString strLog; strLog.Format("<< %s (%X) -> %s (%X): %s", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest, ToString(m_powerStatus)); AddLog(CEC_LOG_NOTICE, strLog.c_str()); @@ -563,7 +778,7 @@ bool CCECBusDevice::TransmitPowerState(cec_logical_address dest) bool CCECBusDevice::TransmitVendorID(cec_logical_address dest) { - CLockObject lock(&m_mutex); + CLockObject lock(&m_writeMutex); if (m_vendor == CEC_VENDOR_UNKNOWN) { CStdString strLog; @@ -591,4 +806,39 @@ bool CCECBusDevice::TransmitVendorID(cec_logical_address dest) return m_processor->Transmit(command); } } + +bool CCECBusDevice::SendKeypress(cec_user_control_code key, bool bWait /* = false */) +{ + CLockObject lock(&m_transmitMutex); + cec_command command; + cec_command::Format(command, m_processor->GetLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_USER_CONTROL_PRESSED); + command.parameters.PushBack((uint8_t)key); + + if (bWait) + { + if (m_processor->Transmit(command)) + return m_condition.Wait(&m_transmitMutex, 1000); + return false; + } + + return m_processor->Transmit(command); +} + +bool CCECBusDevice::SendKeyRelease(bool bWait /* = false */) +{ + CLockObject lock(&m_transmitMutex); + cec_command command; + cec_command::Format(command, m_processor->GetLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_USER_CONTROL_RELEASE); + + if (bWait) + { + if (m_processor->Transmit(command)) + return m_condition.Wait(&m_transmitMutex, 1000); + return false; + } + else + { + return m_processor->Transmit(command); + } +} //@}