#include "LibCEC.h"
-#include "AdapterCommunication.h"
-#include "AdapterDetection.h"
+#include "adapter/AdapterCommunication.h"
+#include "adapter/AdapterDetection.h"
#include "CECProcessor.h"
#include "devices/CECBusDevice.h"
-#include "util/StdString.h"
#include "platform/timeutils.h"
using namespace std;
using namespace CEC;
+using namespace PLATFORM;
CLibCEC::CLibCEC(const char *strDeviceName, cec_device_type_list types) :
m_iStartTime(GetTimeMs()),
m_iCurrentButton(CEC_USER_CONTROL_CODE_UNKNOWN),
m_buttontime(0),
- m_callbacks(NULL)
+ m_callbacks(NULL),
+ m_cbParam(NULL)
{
m_cec = new CCECProcessor(this, strDeviceName, types);
}
m_iStartTime(GetTimeMs()),
m_iCurrentButton(CEC_USER_CONTROL_CODE_UNKNOWN),
m_buttontime(0),
- m_callbacks(NULL)
+ m_callbacks(NULL),
+ m_cbParam(NULL)
{
m_cec = new CCECProcessor(this, strDeviceName, iLogicalAddress, iPhysicalAddress);
}
m_cec->StopThread();
}
-bool CLibCEC::EnableCallbacks(ICECCallbacks *callbacks)
+bool CLibCEC::EnableCallbacks(void *cbParam, ICECCallbacks *callbacks)
{
- CLockObject lock(&m_mutex);
+ CLockObject lock(m_mutex);
if (m_cec)
+ {
+ m_cbParam = cbParam;
m_callbacks = callbacks;
+ }
return false;
}
void CLibCEC::AddLog(cec_log_level level, const string &strMessage)
{
- CLockObject lock(&m_mutex);
+ CLockObject lock(m_mutex);
if (m_cec)
{
cec_log_message message;
snprintf(message.message, sizeof(message.message), "%s", strMessage.c_str());
if (m_callbacks)
- m_callbacks->CBCecLogMessage(message);
+ m_callbacks->CBCecLogMessage(m_cbParam, message);
else
m_logBuffer.Push(message);
}
void CLibCEC::AddKey(cec_keypress &key)
{
- CLockObject lock(&m_mutex);
+ CLockObject lock(m_mutex);
if (m_callbacks)
- m_callbacks->CBCecKeyPress(key);
+ m_callbacks->CBCecKeyPress(m_cbParam, key);
else
m_keyBuffer.Push(key);
m_iCurrentButton = CEC_USER_CONTROL_CODE_UNKNOWN;
void CLibCEC::AddKey(void)
{
- CLockObject lock(&m_mutex);
+ CLockObject lock(m_mutex);
if (m_iCurrentButton != CEC_USER_CONTROL_CODE_UNKNOWN)
{
cec_keypress key;
key.keycode = m_iCurrentButton;
if (m_callbacks)
- m_callbacks->CBCecKeyPress(key);
+ m_callbacks->CBCecKeyPress(m_cbParam, key);
else
m_keyBuffer.Push(key);
m_iCurrentButton = CEC_USER_CONTROL_CODE_UNKNOWN;
void CLibCEC::AddCommand(const cec_command &command)
{
- CLockObject lock(&m_mutex);
+ CLockObject lock(m_mutex);
if (m_callbacks)
{
- m_callbacks->CBCecCommand(command);
+ m_callbacks->CBCecCommand(m_cbParam, command);
}
else if (m_commandBuffer.Push(command))
{