X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2FLibCEC.cpp;h=95e2a2e42e72d1a5cadb37f2be924c207a19a322;hb=e3ac04dc6ac683aec74bd756002371c46cc9285f;hp=ed60f43ff2f25f623e814f86b282c781c5f0e915;hpb=e55f3f703996f8c347db3fe2442893163f5523b7;p=deb_libcec.git diff --git a/src/lib/LibCEC.cpp b/src/lib/LibCEC.cpp index ed60f43..95e2a2e 100644 --- a/src/lib/LibCEC.cpp +++ b/src/lib/LibCEC.cpp @@ -55,14 +55,7 @@ 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 */) @@ -134,16 +127,6 @@ 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; -} - bool CLibCEC::GetNextLogMessage(cec_log_message *message) { return (m_logBuffer.Pop(*message)); @@ -244,6 +227,13 @@ void CLibCEC::AddLog(cec_log_level level, const string &strMessage) } } +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) @@ -254,8 +244,8 @@ 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(const cec_command &command)