X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FLibCEC.cpp;h=1366ff6cbcec92b6567ab0648e8a32cdeac3f87a;hb=e046c7bff238e90b4080f0604c00a45340b0b68c;hp=0f88470554dec9957713e9d4e6d318e10634af5f;hpb=2b32d0ab4a65fd7ac86072285e87972e1131b98a;p=deb_libcec.git diff --git a/src/lib/LibCEC.cpp b/src/lib/LibCEC.cpp index 0f88470..1366ff6 100644 --- a/src/lib/LibCEC.cpp +++ b/src/lib/LibCEC.cpp @@ -35,55 +35,44 @@ #include "AdapterCommunication.h" #include "AdapterDetection.h" #include "CECProcessor.h" +#include "devices/CECBusDevice.h" #include "util/StdString.h" #include "platform/timeutils.h" using namespace std; 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_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_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; - m_cec = NULL; - - delete m_comm; - m_comm = NULL; - - m_logBuffer.Clear(); - m_keyBuffer.Clear(); - m_commandBuffer.Clear(); } 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; } - if (!m_comm->Open(strPort, 38400, iTimeoutMs)) - { - 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; @@ -96,8 +85,6 @@ void CLibCEC::Close(void) { if (m_cec) m_cec->StopThread(); - if (m_comm) - m_comm->Close(); } int8_t CLibCEC::FindAdapters(cec_adapter *deviceList, uint8_t iBufSize, const char *strDevicePath /* = NULL */) @@ -114,22 +101,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; -} - -int8_t CLibCEC::GetMinVersion(void) -{ - return CEC_MIN_VERSION; -} - -int8_t CLibCEC::GetLibVersion(void) -{ - return CEC_LIB_VERSION; + return m_cec ? m_cec->StartBootloader() : false; } bool CLibCEC::GetNextLogMessage(cec_log_message *message) @@ -147,9 +124,9 @@ bool CLibCEC::GetNextCommand(cec_command *command) return m_commandBuffer.Pop(*command); } -bool CLibCEC::Transmit(const cec_frame &data, bool bWaitForAck /* = true */) +bool CLibCEC::Transmit(const cec_command &data) { - return m_cec ? m_cec->Transmit(data, bWaitForAck) : false; + return m_cec ? m_cec->Transmit(data) : false; } bool CLibCEC::SetLogicalAddress(cec_logical_address iLogicalAddress) @@ -157,14 +134,34 @@ bool CLibCEC::SetLogicalAddress(cec_logical_address iLogicalAddress) return m_cec ? m_cec->SetLogicalAddress(iLogicalAddress) : false; } +bool CLibCEC::SetPhysicalAddress(uint16_t iPhysicalAddress /* = CEC_DEFAULT_PHYSICAL_ADDRESS */) +{ + return m_cec ? m_cec->SetPhysicalAddress(iPhysicalAddress) : false; +} + +bool CLibCEC::SetHDMIPort(cec_logical_address iBaseDevice, uint8_t iPort /* = CEC_DEFAULT_HDMI_PORT */) +{ + 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 ? m_cec->PowerOnDevices(address) : false; + return m_cec && address >= CECDEVICE_TV && address <= CECDEVICE_BROADCAST ? m_cec->m_busDevices[(uint8_t)address]->PowerOn() : false; } bool CLibCEC::StandbyDevices(cec_logical_address address /* = CECDEVICE_BROADCAST */) { - return m_cec ? m_cec->StandbyDevices(address) : false; + return m_cec && address >= CECDEVICE_TV && address <= CECDEVICE_BROADCAST ? m_cec->m_busDevices[(uint8_t)address]->Standby() : false; +} + +bool CLibCEC::SetActiveSource(cec_device_type type /* = CEC_DEVICE_TYPE_RESERVED */) +{ + return m_cec ? m_cec->SetActiveSource(type) : false; } bool CLibCEC::SetActiveView(void) @@ -172,9 +169,161 @@ bool CLibCEC::SetActiveView(void) return m_cec ? m_cec->SetActiveView() : false; } +bool CLibCEC::SetDeckControlMode(cec_deck_control_mode mode, bool bSendUpdate /* = true */) +{ + return m_cec ? m_cec->SetDeckControlMode(mode, bSendUpdate) : false; +} + +bool CLibCEC::SetDeckInfo(cec_deck_info info, bool bSendUpdate /* = true */) +{ + return m_cec ? m_cec->SetDeckInfo(info, bSendUpdate) : false; +} + bool CLibCEC::SetInactiveView(void) { - return m_cec ? m_cec->SetInactiveView() : false; + return m_cec ? m_cec->TransmitInactiveSource() : false; +} + +bool CLibCEC::SetMenuState(cec_menu_state state, bool bSendUpdate /* = true */) +{ + return m_cec ? m_cec->SetMenuState(state, bSendUpdate) : false; +} + +bool CLibCEC::SetOSDString(cec_logical_address iLogicalAddress, cec_display_control duration, const char *strMessage) +{ + return m_cec && iLogicalAddress >= CECDEVICE_TV && iLogicalAddress <= CECDEVICE_BROADCAST ? + m_cec->m_busDevices[m_cec->GetLogicalAddress()]->TransmitOSDString(iLogicalAddress, duration, strMessage) : + false; +} + +bool CLibCEC::SwitchMonitoring(bool bEnable) +{ + return m_cec ? m_cec->SwitchMonitoring(bEnable) : false; +} + +cec_version CLibCEC::GetDeviceCecVersion(cec_logical_address iAddress) +{ + if (m_cec && iAddress >= CECDEVICE_TV && iAddress < CECDEVICE_BROADCAST) + return m_cec->GetDeviceCecVersion(iAddress); + return CEC_VERSION_UNKNOWN; +} + +bool CLibCEC::GetDeviceMenuLanguage(cec_logical_address iAddress, cec_menu_language *language) +{ + if (m_cec && iAddress >= CECDEVICE_TV && iAddress < CECDEVICE_BROADCAST) + return m_cec->GetDeviceMenuLanguage(iAddress, language); + return false; +} + +uint64_t CLibCEC::GetDeviceVendorId(cec_logical_address iAddress) +{ + if (m_cec && iAddress >= CECDEVICE_TV && iAddress < CECDEVICE_BROADCAST) + return m_cec->GetDeviceVendorId(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) + return m_cec->GetDevicePowerStatus(iAddress); + return CEC_POWER_STATUS_UNKNOWN; +} + +bool CLibCEC::PollDevice(cec_logical_address iAddress) +{ + if (m_cec && iAddress >= CECDEVICE_TV && iAddress < CECDEVICE_BROADCAST) + return m_cec->PollDevice(iAddress); + return false; +} + +cec_logical_addresses CLibCEC::GetActiveDevices(void) +{ + cec_logical_addresses addresses; + addresses.Clear(); + if (m_cec) + addresses = m_cec->GetActiveDevices(); + return addresses; +} + +bool CLibCEC::IsActiveDevice(cec_logical_address iAddress) +{ + if (m_cec && iAddress >= CECDEVICE_TV && iAddress < CECDEVICE_BROADCAST) + 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->IsPresentDeviceType(type); + return false; +} + +uint8_t CLibCEC::VolumeUp(bool bSendRelease /* = true */) +{ + if (m_cec) + return m_cec->VolumeUp(bSendRelease); + return 0; +} + +uint8_t CLibCEC::VolumeDown(bool bSendRelease /* = true */) +{ + if (m_cec) + return m_cec->VolumeDown(bSendRelease); + return 0; +} + + +uint8_t CLibCEC::MuteAudio(bool bSendRelease /* = true */) +{ + if (m_cec) + return m_cec->MuteAudio(bSendRelease); + return 0; +} + +bool CLibCEC::SendKeypress(cec_logical_address iDestination, cec_user_control_code key, bool bWait /* = true */) +{ + if (m_cec) + return m_cec->TransmitKeypress(iDestination, key, bWait); + return false; +} + +bool CLibCEC::SendKeyRelease(cec_logical_address iDestination, bool bWait /* = true */) +{ + if (m_cec) + return m_cec->TransmitKeyRelease(iDestination, bWait); + return false; +} + +cec_osd_name CLibCEC::GetDeviceOSDName(cec_logical_address iAddress) +{ + cec_osd_name retVal; + retVal.device = iAddress; + retVal.name[0] = 0; + + if (m_cec) + retVal = m_cec->GetDeviceOSDName(iAddress); + + return retVal; } void CLibCEC::AddLog(cec_log_level level, const string &strMessage) @@ -183,11 +332,19 @@ void CLibCEC::AddLog(cec_log_level level, const string &strMessage) { 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); } } +void CLibCEC::AddKey(cec_keypress &key) +{ + m_keyBuffer.Push(key); + m_iCurrentButton = CEC_USER_CONTROL_CODE_UNKNOWN; + m_buttontime = 0; +} + void CLibCEC::AddKey(void) { if (m_iCurrentButton != CEC_USER_CONTROL_CODE_UNKNOWN) @@ -198,24 +355,16 @@ void CLibCEC::AddKey(void) key.keycode = m_iCurrentButton; m_keyBuffer.Push(key); m_iCurrentButton = CEC_USER_CONTROL_CODE_UNKNOWN; - m_buttontime = 0; } + m_buttontime = 0; } -void CLibCEC::AddCommand(cec_logical_address source, cec_logical_address destination, cec_opcode opcode, cec_frame *parameters) +void CLibCEC::AddCommand(const cec_command &command) { - cec_command command; - command.clear(); - - command.source = source; - command.destination = destination; - command.opcode = opcode; - if (parameters) - command.parameters = *parameters; if (m_commandBuffer.Push(command)) { CStdString strDebug; - strDebug.Format("stored command '%d' in the command buffer. buffer size = %d", opcode, m_commandBuffer.Size()); + strDebug.Format("stored command '%2x' in the command buffer. buffer size = %d", command.opcode, m_commandBuffer.Size()); AddLog(CEC_LOG_DEBUG, strDebug); } else @@ -237,6 +386,13 @@ void CLibCEC::SetCurrentButton(cec_user_control_code iButtonCode) { m_iCurrentButton = iButtonCode; m_buttontime = GetTimeMs(); + + /* push keypress to the keybuffer with 0 duration. + push another press to the keybuffer with the duration set when the button is released */ + cec_keypress key; + key.duration = 0; + key.keycode = m_iCurrentButton; + m_keyBuffer.Push(key); } void * CECCreate(const char *strDeviceName, CEC::cec_logical_address iLogicalAddress /*= CEC::CECDEVICE_PLAYBACKDEVICE1 */, uint16_t iPhysicalAddress /* = CEC_DEFAULT_PHYSICAL_ADDRESS */) @@ -244,9 +400,64 @@ void * CECCreate(const char *strDeviceName, CEC::cec_logical_address iLogicalAdd return static_cast< void* > (new CLibCEC(strDeviceName, iLogicalAddress, iPhysicalAddress)); } +void * CECInit(const char *strDeviceName, CEC::cec_device_type_list types) +{ + return static_cast< void* > (new CLibCEC(strDeviceName, types)); +} + void CECDestroy(CEC::ICECAdapter *instance) { CLibCEC *lib = static_cast< CLibCEC* > (instance); if (lib) delete lib; } + +const char *CLibCEC::ToString(const cec_menu_state state) +{ + return m_cec->ToString(state); +} + +const char *CLibCEC::ToString(const cec_version version) +{ + return m_cec->ToString(version); +} + +const char *CLibCEC::ToString(const cec_power_status status) +{ + return m_cec->ToString(status); +} + +const char *CLibCEC::ToString(const cec_logical_address address) +{ + return m_cec->ToString(address); +} + +const char *CLibCEC::ToString(const cec_deck_control_mode mode) +{ + return m_cec->ToString(mode); +} + +const char *CLibCEC::ToString(const cec_deck_info status) +{ + return m_cec->ToString(status); +} + +const char *CLibCEC::ToString(const cec_opcode opcode) +{ + return m_cec->ToString(opcode); +} + +const char *CLibCEC::ToString(const cec_system_audio_status mode) +{ + return m_cec->ToString(mode); +} + +const char *CLibCEC::ToString(const cec_audio_status status) +{ + return m_cec->ToString(status); +} + +const char *CLibCEC::ToString(const cec_vendor_id vendor) +{ + return m_cec->ToString(vendor); +}