X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FLibCEC.cpp;h=29cc3f48abaf944e5214eed70158e7a509815c7c;hb=2db8981f49fbd167ddbbf19c1fbadd064abc332a;hp=55af1803b7c1d951a9937e2df2adc8d420214911;hpb=c3039d2e99a31c129c982d271f25c9c56e353643;p=deb_libcec.git

diff --git a/src/lib/LibCEC.cpp b/src/lib/LibCEC.cpp
index 55af180..29cc3f4 100644
--- a/src/lib/LibCEC.cpp
+++ b/src/lib/LibCEC.cpp
@@ -36,17 +36,18 @@
 #include "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);
 }
@@ -55,7 +56,8 @@ CLibCEC::CLibCEC(const char *strDeviceName, cec_logical_address iLogicalAddress
     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);
 }
@@ -89,11 +91,14 @@ void CLibCEC::Close(void)
     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;
 }
 
@@ -338,7 +343,7 @@ cec_osd_name CLibCEC::GetDeviceOSDName(cec_logical_address iAddress)
 
 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;
@@ -347,7 +352,7 @@ void CLibCEC::AddLog(cec_log_level level, const string &strMessage)
     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);
   }
@@ -355,9 +360,9 @@ void CLibCEC::AddLog(cec_log_level level, const string &strMessage)
 
 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;
@@ -366,7 +371,7 @@ void CLibCEC::AddKey(cec_keypress &key)
 
 void CLibCEC::AddKey(void)
 {
-  CLockObject lock(&m_mutex);
+  CLockObject lock(m_mutex);
   if (m_iCurrentButton != CEC_USER_CONTROL_CODE_UNKNOWN)
   {
     cec_keypress key;
@@ -375,7 +380,7 @@ void CLibCEC::AddKey(void)
     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;
@@ -385,10 +390,10 @@ void CLibCEC::AddKey(void)
 
 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))
   {