X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FLibCEC.cpp;h=52dfa515776a7beada82a77e5c831b7f24209945;hb=7879fa15cd1d00d3334a258ae0fce065c92f6e39;hp=118be7def567f54c2b3b4d2585b169e1d12c7483;hpb=d2f1c15733e3f6f2c8a17abfd3c6612ea93ce734;p=deb_libcec.git diff --git a/src/lib/LibCEC.cpp b/src/lib/LibCEC.cpp index 118be7d..52dfa51 100644 --- a/src/lib/LibCEC.cpp +++ b/src/lib/LibCEC.cpp @@ -45,59 +45,38 @@ using namespace CEC; CLibCEC::CLibCEC(const char *strDeviceName, cec_device_type_list types) : m_iStartTime(GetTimeMs()), m_iCurrentButton(CEC_USER_CONTROL_CODE_UNKNOWN), - m_buttontime(0) + m_buttontime(0), + m_callbacks(NULL), + m_cbParam(NULL) { - m_comm = new CAdapterCommunication(this); - m_cec = new CCECProcessor(this, m_comm, strDeviceName, types); + m_cec = new CCECProcessor(this, strDeviceName, types); } CLibCEC::CLibCEC(const char *strDeviceName, cec_logical_address iLogicalAddress /* = CECDEVICE_PLAYBACKDEVICE1 */, uint16_t iPhysicalAddress /* = CEC_DEFAULT_PHYSICAL_ADDRESS */) : m_iStartTime(GetTimeMs()), m_iCurrentButton(CEC_USER_CONTROL_CODE_UNKNOWN), - m_buttontime(0) + m_buttontime(0), + m_callbacks(NULL), + m_cbParam(NULL) { - m_comm = new CAdapterCommunication(this); - m_cec = new CCECProcessor(this, m_comm, strDeviceName, iLogicalAddress, iPhysicalAddress); + m_cec = new CCECProcessor(this, strDeviceName, iLogicalAddress, iPhysicalAddress); } CLibCEC::~CLibCEC(void) { Close(); delete m_cec; - delete m_comm; } bool CLibCEC::Open(const char *strPort, uint32_t iTimeoutMs /* = 10000 */) { - if (!m_comm) - { - AddLog(CEC_LOG_ERROR, "no comm port"); - return false; - } - - if (m_comm->IsOpen()) + if (m_cec->IsRunning()) { AddLog(CEC_LOG_ERROR, "connection already open"); return false; } - int64_t iNow = GetTimeMs(); - int64_t iTarget = iNow + iTimeoutMs; - - bool bOpened(false); - while (!bOpened && iNow < iTarget) - { - bOpened = m_comm->Open(strPort, 38400, iTimeoutMs); - iNow = GetTimeMs(); - } - - if (!bOpened) - { - AddLog(CEC_LOG_ERROR, "could not open a connection"); - return false; - } - - if (!m_cec->Start()) + if (!m_cec->Start(strPort, 38400, iTimeoutMs)) { AddLog(CEC_LOG_ERROR, "could not start CEC communications"); return false; @@ -110,8 +89,17 @@ void CLibCEC::Close(void) { if (m_cec) m_cec->StopThread(); - if (m_comm) - m_comm->Close(); +} + +bool CLibCEC::EnableCallbacks(void *cbParam, ICECCallbacks *callbacks) +{ + CLockObject lock(&m_mutex); + if (m_cec) + { + m_cbParam = cbParam; + m_callbacks = callbacks; + } + return false; } int8_t CLibCEC::FindAdapters(cec_adapter *deviceList, uint8_t iBufSize, const char *strDevicePath /* = NULL */) @@ -128,12 +116,12 @@ int8_t CLibCEC::FindAdapters(cec_adapter *deviceList, uint8_t iBufSize, const ch bool CLibCEC::PingAdapter(void) { - return m_comm ? m_comm->PingAdapter() : false; + return m_cec ? m_cec->PingAdapter() : false; } bool CLibCEC::StartBootloader(void) { - return m_comm ? m_comm->StartBootloader() : false; + return m_cec ? m_cec->StartBootloader() : false; } bool CLibCEC::GetNextLogMessage(cec_log_message *message) @@ -171,6 +159,11 @@ bool CLibCEC::SetHDMIPort(cec_logical_address iBaseDevice, uint8_t iPort /* = CE return m_cec ? m_cec->SetHDMIPort(iBaseDevice, iPort) : false; } +bool CLibCEC::EnablePhysicalAddressDetection(void) +{ + return m_cec ? m_cec->EnablePhysicalAddressDetection() : false; +} + bool CLibCEC::PowerOnDevices(cec_logical_address address /* = CECDEVICE_TV */) { return m_cec && address >= CECDEVICE_TV && address <= CECDEVICE_BROADCAST ? m_cec->m_busDevices[(uint8_t)address]->PowerOn() : false; @@ -244,6 +237,25 @@ uint64_t CLibCEC::GetDeviceVendorId(cec_logical_address iAddress) return 0; } +uint16_t CLibCEC::GetDevicePhysicalAddress(cec_logical_address iAddress) +{ + if (m_cec && iAddress >= CECDEVICE_TV && iAddress < CECDEVICE_BROADCAST) + return m_cec->GetDevicePhysicalAddress(iAddress); + return 0; +} + +cec_logical_address CLibCEC::GetActiveSource(void) +{ + return m_cec ? m_cec->GetActiveSource() : CECDEVICE_UNKNOWN; +} + +bool CLibCEC::IsActiveSource(cec_logical_address iAddress) +{ + if (m_cec && iAddress >= CECDEVICE_TV && iAddress < CECDEVICE_BROADCAST) + return m_cec->IsActiveSource(iAddress); + return false; +} + cec_power_status CLibCEC::GetDevicePowerStatus(cec_logical_address iAddress) { if (m_cec && iAddress >= CECDEVICE_TV && iAddress < CECDEVICE_BROADCAST) @@ -270,54 +282,54 @@ cec_logical_addresses CLibCEC::GetActiveDevices(void) bool CLibCEC::IsActiveDevice(cec_logical_address iAddress) { if (m_cec && iAddress >= CECDEVICE_TV && iAddress < CECDEVICE_BROADCAST) - return m_cec->IsActiveDevice(iAddress); + return m_cec->IsPresentDevice(iAddress); return false; } bool CLibCEC::IsActiveDeviceType(cec_device_type type) { if (m_cec && type >= CEC_DEVICE_TYPE_TV && type <= CEC_DEVICE_TYPE_AUDIO_SYSTEM) - return m_cec->IsActiveDeviceType(type); + return m_cec->IsPresentDeviceType(type); return false; } -uint8_t CLibCEC::VolumeUp(bool bWait /* = true */) +uint8_t CLibCEC::VolumeUp(bool bSendRelease /* = true */) { if (m_cec) - return m_cec->VolumeUp(bWait); + return m_cec->VolumeUp(bSendRelease); return 0; } -uint8_t CLibCEC::VolumeDown(bool bWait /* = true */) +uint8_t CLibCEC::VolumeDown(bool bSendRelease /* = true */) { if (m_cec) - return m_cec->VolumeDown(bWait); + return m_cec->VolumeDown(bSendRelease); return 0; } -uint8_t CLibCEC::MuteAudio(bool bWait /* = true */) +uint8_t CLibCEC::MuteAudio(bool bSendRelease /* = true */) { if (m_cec) - return m_cec->MuteAudio(bWait); + return m_cec->MuteAudio(bSendRelease); return 0; } -bool CLibCEC::SendKeypress(cec_logical_address iDestination, cec_user_control_code key, bool bWait /* = false */) +bool CLibCEC::SendKeypress(cec_logical_address iDestination, cec_user_control_code key, bool bWait /* = true */) { if (m_cec) - return m_cec->SendKeypress(iDestination, key, bWait); + return m_cec->TransmitKeypress(iDestination, key, bWait); return false; } -bool CLibCEC::SendKeyRelease(cec_logical_address iDestination, bool bWait /* = false */) +bool CLibCEC::SendKeyRelease(cec_logical_address iDestination, bool bWait /* = true */) { if (m_cec) - return m_cec->SendKeyRelease(iDestination, bWait); + return m_cec->TransmitKeyRelease(iDestination, bWait); return false; } -cec_osd_name CLibCEC::GetOSDName(cec_logical_address iAddress) +cec_osd_name CLibCEC::GetDeviceOSDName(cec_logical_address iAddress) { cec_osd_name retVal; retVal.device = iAddress; @@ -331,32 +343,46 @@ cec_osd_name CLibCEC::GetOSDName(cec_logical_address iAddress) void CLibCEC::AddLog(cec_log_level level, const string &strMessage) { + CLockObject lock(&m_mutex); if (m_cec) { cec_log_message message; message.level = level; message.time = GetTimeMs() - m_iStartTime; snprintf(message.message, sizeof(message.message), "%s", strMessage.c_str()); - m_logBuffer.Push(message); + + if (m_callbacks) + m_callbacks->CBCecLogMessage(m_cbParam, message); + else + m_logBuffer.Push(message); } } void CLibCEC::AddKey(cec_keypress &key) { - m_keyBuffer.Push(key); + CLockObject lock(&m_mutex); + if (m_callbacks) + m_callbacks->CBCecKeyPress(m_cbParam, key); + else + m_keyBuffer.Push(key); m_iCurrentButton = CEC_USER_CONTROL_CODE_UNKNOWN; m_buttontime = 0; } void CLibCEC::AddKey(void) { + CLockObject lock(&m_mutex); if (m_iCurrentButton != CEC_USER_CONTROL_CODE_UNKNOWN) { cec_keypress key; key.duration = (unsigned int) (GetTimeMs() - m_buttontime); key.keycode = m_iCurrentButton; - m_keyBuffer.Push(key); + + if (m_callbacks) + m_callbacks->CBCecKeyPress(m_cbParam, key); + else + m_keyBuffer.Push(key); m_iCurrentButton = CEC_USER_CONTROL_CODE_UNKNOWN; } m_buttontime = 0; @@ -364,7 +390,12 @@ void CLibCEC::AddKey(void) void CLibCEC::AddCommand(const cec_command &command) { - if (m_commandBuffer.Push(command)) + CLockObject lock(&m_mutex); + if (m_callbacks) + { + m_callbacks->CBCecCommand(m_cbParam, command); + } + else if (m_commandBuffer.Push(command)) { CStdString strDebug; strDebug.Format("stored command '%2x' in the command buffer. buffer size = %d", command.opcode, m_commandBuffer.Size());