X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FLibCEC.cpp;h=f8607004e50c257ed01a3ebc50c485ab2c89d2fb;hb=004b83822a351e1fb6e982a9183a12a430b0b769;hp=88e93e0dcd07a2d3ae2c366c46d068219b8faa54;hpb=5daed059e1d5bca3ddfa0787679ef4e7b349e382;p=deb_libcec.git

diff --git a/src/lib/LibCEC.cpp b/src/lib/LibCEC.cpp
index 88e93e0..f860700 100644
--- a/src/lib/LibCEC.cpp
+++ b/src/lib/LibCEC.cpp
@@ -35,37 +35,32 @@
 #include "adapter/USBCECAdapterDetection.h"
 #include "adapter/USBCECAdapterCommunication.h"
 #include "CECProcessor.h"
+#include "devices/CECAudioSystem.h"
 #include "devices/CECBusDevice.h"
+#include "devices/CECPlaybackDevice.h"
+#include "devices/CECTV.h"
 #include "platform/util/timeutils.h"
 #include "platform/util/StdString.h"
 
+#include "CECClient.h"
+
 using namespace std;
 using namespace CEC;
 using namespace PLATFORM;
 
-CLibCEC::CLibCEC(const char *strDeviceName, cec_device_type_list types, uint16_t iPhysicalAddress /* = 0 */) :
-    m_iStartTime(GetTimeMs()),
-    m_iCurrentButton(CEC_USER_CONTROL_CODE_UNKNOWN),
-    m_buttontime(0),
-    m_callbacks(NULL),
-    m_cbParam(NULL)
-{
-  m_cec = new CCECProcessor(this, strDeviceName, types, iPhysicalAddress);
-}
-
-CLibCEC::CLibCEC(libcec_configuration *configuration) :
-    m_iStartTime(GetTimeMs()),
-    m_iCurrentButton(CEC_USER_CONTROL_CODE_UNKNOWN),
-    m_buttontime(0),
-    m_callbacks(configuration->callbacks),
-    m_cbParam(configuration->callbackParam)
+CLibCEC::CLibCEC(void) :
+    m_client(NULL),
+    m_iStartTime(GetTimeMs())
 {
-  m_cec = new CCECProcessor(this, configuration);
+  m_cec = new CCECProcessor(this);
 }
 
 CLibCEC::~CLibCEC(void)
 {
+  delete m_client;
+  m_client = NULL;
   delete m_cec;
+  m_cec = NULL;
 }
 
 bool CLibCEC::Open(const char *strPort, uint32_t iTimeoutMs /* = CEC_DEFAULT_CONNECT_TIMEOUT */)
@@ -82,35 +77,36 @@ bool CLibCEC::Open(const char *strPort, uint32_t iTimeoutMs /* = CEC_DEFAULT_CON
     return false;
   }
 
+  for (vector<CCECClient *>::iterator it = m_clients.begin(); it != m_clients.end(); it++)
+  {
+    if (!m_cec->RegisterClient(*it))
+    {
+      AddLog(CEC_LOG_ERROR, "failed to register a CEC client");
+      return false;
+    }
+  }
+
   return true;
 }
 
 void CLibCEC::Close(void)
 {
-  if (m_cec)
-    m_cec->Close();
-}
+  m_clients.clear();
 
-bool CLibCEC::EnableCallbacks(void *cbParam, ICECCallbacks *callbacks)
-{
-  CLockObject lock(m_mutex);
+  if (m_client)
+  {
+    delete m_client;
+    m_client = NULL;
+  }
   if (m_cec)
   {
-    m_cbParam   = cbParam;
-    m_callbacks = callbacks;
+    delete m_cec;
+    m_cec = NULL;
   }
-  return false;
 }
 
 int8_t CLibCEC::FindAdapters(cec_adapter *deviceList, uint8_t iBufSize, const char *strDevicePath /* = NULL */)
 {
-  CStdString strDebug;
-  if (strDevicePath)
-    strDebug.Format("trying to autodetect the com port for device path '%s'", strDevicePath);
-  else
-    strDebug.Format("trying to autodetect all CEC adapters");
-  AddLog(CEC_LOG_DEBUG, strDebug);
-
   return CUSBCECAdapterDetection::FindAdapters(deviceList, iBufSize, strDevicePath);
 }
 
@@ -124,639 +120,876 @@ bool CLibCEC::StartBootloader(void)
   return m_cec ? m_cec->StartBootloader() : false;
 }
 
-bool CLibCEC::GetNextLogMessage(cec_log_message *message)
-{
-  return (m_logBuffer.Pop(*message));
-}
-
-bool CLibCEC::GetNextKeypress(cec_keypress *key)
-{
-  return m_keyBuffer.Pop(*key);
-}
-
-bool CLibCEC::GetNextCommand(cec_command *command)
-{
-  return m_commandBuffer.Pop(*command);
-}
-
-bool CLibCEC::Transmit(const cec_command &data)
-{
-  return m_cec ? m_cec->Transmit(data) : false;
-}
-
-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 */)
+bool CLibCEC::SwitchMonitoring(bool bEnable)
 {
-  return m_cec ? m_cec->SetHDMIPort(iBaseDevice, iPort) : false;
+  return m_cec ? m_cec->SwitchMonitoring(bEnable) : false;
 }
 
-bool CLibCEC::EnablePhysicalAddressDetection(void)
+cec_logical_address CLibCEC::GetActiveSource(void)
 {
-  return m_cec ? m_cec->EnablePhysicalAddressDetection() : false;
+  return m_cec ? m_cec->GetActiveSource() : CECDEVICE_UNKNOWN;
 }
 
-bool CLibCEC::PowerOnDevices(cec_logical_address address /* = CECDEVICE_TV */)
+bool CLibCEC::IsActiveSource(cec_logical_address iAddress)
 {
-  return m_cec && address >= CECDEVICE_TV && address <= CECDEVICE_BROADCAST ? m_cec->PowerOnDevices(address) : false;
+  return m_cec ? m_cec->IsActiveSource(iAddress) : false;
 }
 
-bool CLibCEC::StandbyDevices(cec_logical_address address /* = CECDEVICE_BROADCAST */)
+bool CLibCEC::PollDevice(cec_logical_address iAddress)
 {
-  return m_cec && address >= CECDEVICE_TV && address <= CECDEVICE_BROADCAST ? m_cec->StandbyDevices(address) : false;
+  return m_cec ? m_cec->PollDevice(iAddress) : false;
 }
 
-bool CLibCEC::SetActiveSource(cec_device_type type /* = CEC_DEVICE_TYPE_RESERVED */)
+cec_logical_addresses CLibCEC::GetActiveDevices(void)
 {
-  return m_cec ? m_cec->SetActiveSource(type) : false;
+  CECDEVICEVEC activeDevices;
+  if (m_cec)
+    m_cec->GetDevices()->GetActive(activeDevices);
+  return CCECDeviceMap::ToLogicalAddresses(activeDevices);
 }
 
-bool CLibCEC::SetActiveView(void)
+bool CLibCEC::IsActiveDevice(cec_logical_address iAddress)
 {
-  return m_cec ? m_cec->SetActiveView() : false;
+  cec_logical_addresses activeDevices = GetActiveDevices();
+  return activeDevices.IsSet(iAddress);
 }
 
-bool CLibCEC::SetDeckControlMode(cec_deck_control_mode mode, bool bSendUpdate /* = true */)
+bool CLibCEC::IsActiveDeviceType(cec_device_type type)
 {
-  return m_cec ? m_cec->SetDeckControlMode(mode, bSendUpdate) : false;
+  CECDEVICEVEC activeDevices;
+  if (m_cec)
+    m_cec->GetDevices()->GetActive(activeDevices);
+  CCECDeviceMap::FilterType(type, activeDevices);
+  return !activeDevices.empty();
 }
 
-bool CLibCEC::SetDeckInfo(cec_deck_info info, bool bSendUpdate /* = true */)
+bool CLibCEC::SetStreamPath(cec_logical_address iAddress)
 {
-  return m_cec ? m_cec->SetDeckInfo(info, bSendUpdate) : false;
+  uint16_t iPhysicalAddress = GetDevicePhysicalAddress(iAddress);
+  if (iPhysicalAddress != CEC_INVALID_PHYSICAL_ADDRESS)
+    return SetStreamPath(iPhysicalAddress);
+  return false;
 }
 
-bool CLibCEC::SetInactiveView(void)
+bool CLibCEC::SetStreamPath(uint16_t iPhysicalAddress)
 {
-  return m_cec ? m_cec->TransmitInactiveSource() : false;
+  return m_cec->SetStreamPath(iPhysicalAddress);
 }
 
-bool CLibCEC::SetMenuState(cec_menu_state state, bool bSendUpdate /* = true */)
+bool CLibCEC::IsLibCECActiveSource(void)
 {
-  return m_cec ? m_cec->SetMenuState(state, bSendUpdate) : false;
+  bool bReturn(false);
+  if (m_cec)
+  {
+    cec_logical_address activeSource = m_cec->GetActiveSource();
+    CCECBusDevice *device = m_cec->GetDevice(activeSource);
+    if (device)
+      bReturn = device->IsHandledByLibCEC();
+  }
+  return bReturn;
 }
 
-bool CLibCEC::SetOSDString(cec_logical_address iLogicalAddress, cec_display_control duration, const char *strMessage)
+bool CLibCEC::CanPersistConfiguration(void)
 {
-  return m_cec && iLogicalAddress >= CECDEVICE_TV && iLogicalAddress <= CECDEVICE_BROADCAST ?
-      m_cec->m_busDevices[m_cec->GetLogicalAddress()]->TransmitOSDString(iLogicalAddress, duration, strMessage) :
-      false;
+  return m_cec->CanPersistConfiguration();
 }
 
-bool CLibCEC::SwitchMonitoring(bool bEnable)
+bool CLibCEC::PersistConfiguration(libcec_configuration *configuration)
 {
-  return m_cec ? m_cec->SwitchMonitoring(bEnable) : false;
+  return m_cec->PersistConfiguration(configuration);
 }
 
-cec_version CLibCEC::GetDeviceCecVersion(cec_logical_address iAddress)
+void CLibCEC::RescanActiveDevices(void)
 {
-  if (m_cec && iAddress >= CECDEVICE_TV && iAddress < CECDEVICE_BROADCAST)
-    return m_cec->GetDeviceCecVersion(iAddress);
-  return CEC_VERSION_UNKNOWN;
+  return m_cec->RescanActiveDevices();
 }
 
-bool CLibCEC::GetDeviceMenuLanguage(cec_logical_address iAddress, cec_menu_language *language)
+bool CLibCEC::EnableCallbacks(void *cbParam, ICECCallbacks *callbacks)
 {
-  if (m_cec && iAddress >= CECDEVICE_TV && iAddress < CECDEVICE_BROADCAST)
-    return m_cec->GetDeviceMenuLanguage(iAddress, language);
-  return false;
+  return m_client ? m_client->EnableCallbacks(cbParam, callbacks) : false;
 }
 
-uint64_t CLibCEC::GetDeviceVendorId(cec_logical_address iAddress)
+bool CLibCEC::GetCurrentConfiguration(libcec_configuration *configuration)
 {
-  if (m_cec && iAddress >= CECDEVICE_TV && iAddress < CECDEVICE_BROADCAST)
-    return m_cec->GetDeviceVendorId(iAddress);
-  return 0;
+  return m_client ? m_client->GetCurrentConfiguration(configuration) : false;
 }
 
-uint16_t CLibCEC::GetDevicePhysicalAddress(cec_logical_address iAddress)
+bool CLibCEC::SetConfiguration(const libcec_configuration *configuration)
 {
-  if (m_cec && iAddress >= CECDEVICE_TV && iAddress < CECDEVICE_BROADCAST)
-    return m_cec->GetDevicePhysicalAddress(iAddress);
-  return 0;
+  return m_client ? m_client->SetConfiguration(configuration) : false;
 }
 
-cec_logical_address CLibCEC::GetActiveSource(void)
+bool CLibCEC::Transmit(const cec_command &data)
 {
-  return m_cec ? m_cec->GetActiveSource() : CECDEVICE_UNKNOWN;
+  return m_client ? m_client->Transmit(data) : false;
 }
 
-bool CLibCEC::IsActiveSource(cec_logical_address iAddress)
+bool CLibCEC::SetLogicalAddress(cec_logical_address iLogicalAddress)
 {
-  if (m_cec && iAddress >= CECDEVICE_TV && iAddress < CECDEVICE_BROADCAST)
-    return m_cec->IsActiveSource(iAddress);
-  return false;
+  return m_client ? m_client->SetLogicalAddress(iLogicalAddress) : false;
 }
 
-cec_power_status CLibCEC::GetDevicePowerStatus(cec_logical_address iAddress)
+bool CLibCEC::SetPhysicalAddress(uint16_t iPhysicalAddress /* = CEC_DEFAULT_PHYSICAL_ADDRESS */)
 {
-  if (m_cec && iAddress >= CECDEVICE_TV && iAddress < CECDEVICE_BROADCAST)
-    return m_cec->GetDevicePowerStatus(iAddress);
-  return CEC_POWER_STATUS_UNKNOWN;
+  return m_client ? m_client->SetPhysicalAddress(iPhysicalAddress) : false;
 }
 
-bool CLibCEC::PollDevice(cec_logical_address iAddress)
+bool CLibCEC::SetHDMIPort(cec_logical_address iBaseDevice, uint8_t iPort /* = CEC_DEFAULT_HDMI_PORT */)
 {
-  if (m_cec && iAddress >= CECDEVICE_TV && iAddress < CECDEVICE_BROADCAST)
-    return m_cec->PollDevice(iAddress);
-  return false;
+  return m_client ? m_client->SetHDMIPort(iBaseDevice, iPort) : false;
 }
 
-cec_logical_addresses CLibCEC::GetActiveDevices(void)
+bool CLibCEC::PowerOnDevices(cec_logical_address address /* = CECDEVICE_TV */)
 {
-  cec_logical_addresses addresses;
-  addresses.Clear();
-  if (m_cec)
-    addresses = m_cec->GetActiveDevices();
-  return addresses;
+  return m_client ? m_client->SendPowerOnDevices(address) : false;
 }
 
-bool CLibCEC::IsActiveDevice(cec_logical_address iAddress)
+bool CLibCEC::StandbyDevices(cec_logical_address address /* = CECDEVICE_BROADCAST */)
 {
-  if (m_cec && iAddress >= CECDEVICE_TV && iAddress < CECDEVICE_BROADCAST)
-    return m_cec->IsPresentDevice(iAddress);
-  return false;
+  return m_client ? m_client->SendStandbyDevices(address) : false;
 }
 
-bool CLibCEC::IsActiveDeviceType(cec_device_type type)
+bool CLibCEC::SetActiveSource(cec_device_type type /* = CEC_DEVICE_TYPE_RESERVED */)
 {
-  if (m_cec && type >= CEC_DEVICE_TYPE_TV && type <= CEC_DEVICE_TYPE_AUDIO_SYSTEM)
-    return m_cec->IsPresentDeviceType(type);
-  return false;
+  return m_client ? m_client->SendSetActiveSource(type) : false;
 }
 
-uint8_t CLibCEC::VolumeUp(bool bSendRelease /* = true */)
+bool CLibCEC::SetDeckControlMode(cec_deck_control_mode mode, bool bSendUpdate /* = true */)
 {
-  if (m_cec)
-    return m_cec->VolumeUp(bSendRelease);
-  return 0;
+  return m_client ? m_client->SendSetDeckControlMode(mode, bSendUpdate) : false;
 }
 
-uint8_t CLibCEC::VolumeDown(bool bSendRelease /* = true */)
+bool CLibCEC::SetDeckInfo(cec_deck_info info, bool bSendUpdate /* = true */)
 {
-  if (m_cec)
-    return m_cec->VolumeDown(bSendRelease);
-  return 0;
+  return m_client ? m_client->SendSetDeckInfo(info, bSendUpdate) : false;
 }
 
-
-uint8_t CLibCEC::MuteAudio(bool bSendRelease /* = true */)
+bool CLibCEC::SetInactiveView(void)
 {
-  if (m_cec)
-    return m_cec->MuteAudio(bSendRelease);
-  return 0;
+  return m_client ? m_client->SendSetInactiveView() : false;
 }
 
-bool CLibCEC::SendKeypress(cec_logical_address iDestination, cec_user_control_code key, bool bWait /* = true */)
+bool CLibCEC::SetMenuState(cec_menu_state state, bool bSendUpdate /* = true */)
 {
-  if (m_cec)
-    return m_cec->TransmitKeypress(iDestination, key, bWait);
-  return false;
+  return m_client ? m_client->SendSetMenuState(state, bSendUpdate) : false;
 }
 
-bool CLibCEC::SendKeyRelease(cec_logical_address iDestination, bool bWait /* = true */)
+bool CLibCEC::SetOSDString(cec_logical_address iLogicalAddress, cec_display_control duration, const char *strMessage)
 {
-  if (m_cec)
-    return m_cec->TransmitKeyRelease(iDestination, bWait);
-  return false;
+  return m_client ? m_client->SendSetOSDString(iLogicalAddress, duration, strMessage) : false;
 }
 
-cec_osd_name CLibCEC::GetDeviceOSDName(cec_logical_address iAddress)
+cec_version CLibCEC::GetDeviceCecVersion(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;
+  return m_client ? m_client->GetDeviceCecVersion(iAddress) : CEC_VERSION_UNKNOWN;
 }
 
-void CLibCEC::AddLog(const cec_log_level level, const char *strFormat, ...)
+bool CLibCEC::GetDeviceMenuLanguage(cec_logical_address iAddress, cec_menu_language *language)
 {
-  CStdString strLog;
-
-  va_list argList;
-  va_start(argList, strFormat);
-  strLog.FormatV(strFormat, argList);
-  va_end(argList);
-
-  CLibCEC *instance = CLibCEC::GetInstance();
-  if (!instance)
-    return;
-  CLockObject lock(instance->m_logMutex);
-
-  cec_log_message message;
-  message.level = level;
-  message.time = GetTimeMs() - instance->m_iStartTime;
-  snprintf(message.message, sizeof(message.message), "%s", strLog.c_str());
-
-  if (instance->m_callbacks && instance->m_callbacks->CBCecLogMessage)
-    instance->m_callbacks->CBCecLogMessage(instance->m_cbParam, message);
-  else
-    instance->m_logBuffer.Push(message);
+  return m_client ? m_client->GetDeviceMenuLanguage(iAddress, language) : false;
 }
 
-void CLibCEC::AddKey(const cec_keypress &key)
+uint64_t CLibCEC::GetDeviceVendorId(cec_logical_address iAddress)
 {
-  CLibCEC *instance = CLibCEC::GetInstance();
-  if (!instance)
-    return;
-  CLockObject lock(instance->m_mutex);
-
-  AddLog(CEC_LOG_DEBUG, "key pressed: %1x", key.keycode);
-
-  if (instance->m_callbacks && instance->m_callbacks->CBCecKeyPress)
-    instance->m_callbacks->CBCecKeyPress(instance->m_cbParam, key);
-  else
-    instance->m_keyBuffer.Push(key);
-
-  instance->m_iCurrentButton = key.duration > 0 ? CEC_USER_CONTROL_CODE_UNKNOWN : key.keycode;
-  instance->m_buttontime = key.duration > 0 ? 0 : GetTimeMs();
+  return m_client ? m_client->GetDeviceVendorId(iAddress) : (uint64_t)CEC_VENDOR_UNKNOWN;
 }
 
-void CLibCEC::ConfigurationChanged(const libcec_configuration &config)
+uint16_t CLibCEC::GetDevicePhysicalAddress(cec_logical_address iAddress)
 {
-  CLibCEC *instance = CLibCEC::GetInstance();
-  CLockObject lock(instance->m_mutex);
-
-  if (instance->m_callbacks &&
-      config.clientVersion >= CEC_CLIENT_VERSION_1_5_0 &&
-      instance->m_callbacks->CBCecConfigurationChanged &&
-      instance->m_cec->IsInitialised())
-    instance->m_callbacks->CBCecConfigurationChanged(instance->m_cbParam, config);
+  return m_client ? m_client->GetDevicePhysicalAddress(iAddress) : CEC_INVALID_PHYSICAL_ADDRESS;
 }
 
-void CLibCEC::SetCurrentButton(cec_user_control_code iButtonCode)
+cec_power_status CLibCEC::GetDevicePowerStatus(cec_logical_address iAddress)
 {
-  /* 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 = iButtonCode;
-
-  AddKey(key);
+  return m_client ? m_client->GetDevicePowerStatus(iAddress) : CEC_POWER_STATUS_UNKNOWN;
 }
 
-void CLibCEC::AddKey(void)
+uint8_t CLibCEC::VolumeUp(bool bSendRelease /* = true */)
 {
-  CLibCEC *instance = CLibCEC::GetInstance();
-  if (!instance)
-    return;
-  CLockObject lock(instance->m_mutex);
-
-  if (instance->m_iCurrentButton != CEC_USER_CONTROL_CODE_UNKNOWN)
-  {
-    cec_keypress key;
-
-    key.duration = (unsigned int) (GetTimeMs() - instance->m_buttontime);
-    key.keycode = instance->m_iCurrentButton;
-    AddLog(CEC_LOG_DEBUG, "key released: %1x", key.keycode);
-
-    if (instance->m_callbacks && instance->m_callbacks->CBCecKeyPress)
-      instance->m_callbacks->CBCecKeyPress(instance->m_cbParam, key);
-    else
-      instance->m_keyBuffer.Push(key);
-    instance->m_iCurrentButton = CEC_USER_CONTROL_CODE_UNKNOWN;
-  }
-  instance->m_buttontime = 0;
+  return m_client ? m_client->SendVolumeUp(bSendRelease) : (uint8_t)CEC_AUDIO_VOLUME_STATUS_UNKNOWN;
 }
 
-void CLibCEC::AddCommand(const cec_command &command)
+uint8_t CLibCEC::VolumeDown(bool bSendRelease /* = true */)
 {
-  CLibCEC *instance = CLibCEC::GetInstance();
-  if (!instance)
-    return;
-  CLockObject lock(instance->m_mutex);
-
-  AddLog(CEC_LOG_NOTICE, ">> %s (%X) -> %s (%X): %s (%2X)", instance->m_cec->ToString(command.initiator), command.initiator, instance->m_cec->ToString(command.destination), command.destination, instance->m_cec->ToString(command.opcode), command.opcode);
-
-  if (instance->m_callbacks && instance->m_callbacks->CBCecCommand)
-    instance->m_callbacks->CBCecCommand(instance->m_cbParam, command);
-  else if (!instance->m_commandBuffer.Push(command))
-    AddLog(CEC_LOG_WARNING, "command buffer is full");
+  return m_client ? m_client->SendVolumeDown(bSendRelease) : (uint8_t)CEC_AUDIO_VOLUME_STATUS_UNKNOWN;
 }
 
-void CLibCEC::Alert(const libcec_alert type, const libcec_parameter &param)
+uint8_t CLibCEC::MuteAudio(bool UNUSED(bSendRelease) /* = true */)
 {
-  CLibCEC *instance = CLibCEC::GetInstance();
-  if (!instance)
-    return;
-  CLockObject lock(instance->m_mutex);
-
-  libcec_configuration config;
-  instance->GetCurrentConfiguration(&config);
-
-  if (instance->m_callbacks &&
-      config.clientVersion >= CEC_CLIENT_VERSION_1_6_0 &&
-      instance->m_cec->IsInitialised() &&
-      instance->m_callbacks->CBCecAlert)
-    instance->m_callbacks->CBCecAlert(instance->m_cbParam, type, param);
-
-  if (type == CEC_ALERT_CONNECTION_LOST)
-    instance->Close();
+  return m_client ? m_client->SendMuteAudio() : (uint8_t)CEC_AUDIO_VOLUME_STATUS_UNKNOWN;
 }
 
-void CLibCEC::CheckKeypressTimeout(void)
+bool CLibCEC::SendKeypress(cec_logical_address iDestination, cec_user_control_code key, bool bWait /* = true */)
 {
-  if (m_iCurrentButton != CEC_USER_CONTROL_CODE_UNKNOWN && GetTimeMs() - m_buttontime > CEC_BUTTON_TIMEOUT)
-  {
-    AddKey();
-    m_iCurrentButton = CEC_USER_CONTROL_CODE_UNKNOWN;
-  }
+  return m_client ? m_client->SendKeypress(iDestination, key, bWait) : false;
 }
 
-int CLibCEC::MenuStateChanged(const cec_menu_state newState)
+bool CLibCEC::SendKeyRelease(cec_logical_address iDestination, bool bWait /* = true */)
 {
-  int iReturn(0);
-
-  CLibCEC *instance = CLibCEC::GetInstance();
-  if (!instance)
-    return iReturn;
-  CLockObject lock(instance->m_mutex);
-
-  AddLog(CEC_LOG_NOTICE, ">> %s: %s", instance->m_cec->ToString(CEC_OPCODE_MENU_REQUEST), instance->m_cec->ToString(newState));
-
-  libcec_configuration config;
-  instance->GetCurrentConfiguration(&config);
-
-  if (instance->m_callbacks &&
-      config.clientVersion >= CEC_CLIENT_VERSION_1_6_2 &&
-      instance->m_callbacks->CBCecMenuStateChanged)
-    iReturn = instance->m_callbacks->CBCecMenuStateChanged(instance->m_cbParam, newState);
-
-  return iReturn;
+  return m_client ? m_client->SendKeyRelease(iDestination, bWait) : false;
 }
 
-bool CLibCEC::SetStreamPath(cec_logical_address iAddress)
+cec_osd_name CLibCEC::GetDeviceOSDName(cec_logical_address iAddress)
 {
-  uint16_t iPhysicalAddress = GetDevicePhysicalAddress(iAddress);
-  if (iPhysicalAddress != CEC_INVALID_PHYSICAL_ADDRESS)
-    return SetStreamPath(iPhysicalAddress);
-  return false;
+  cec_osd_name retVal;
+  if (m_client)
+    retVal = m_client->GetDeviceOSDName(iAddress);
+  return retVal;
 }
 
-bool CLibCEC::SetStreamPath(uint16_t iPhysicalAddress)
+cec_logical_addresses CLibCEC::GetLogicalAddresses(void)
 {
-  return m_cec->SetStreamPath(iPhysicalAddress);
+  cec_logical_addresses addresses;
+  if (m_cec)
+    addresses = m_cec->GetLogicalAddresses();
+  return addresses;
 }
 
-cec_logical_addresses CLibCEC::GetLogicalAddresses(void)
+bool CLibCEC::GetNextLogMessage(cec_log_message *message)
 {
-  cec_logical_addresses addr = m_cec->GetLogicalAddresses();
-  return addr;
+  return m_client ? m_client->GetNextLogMessage(message) : false;
 }
 
-static CLibCEC *g_libCEC_instance(NULL);
-CLibCEC *CLibCEC::GetInstance(void)
+bool CLibCEC::GetNextKeypress(cec_keypress *key)
 {
-  return g_libCEC_instance;
+  return m_client ? m_client->GetNextKeypress(key) : false;
 }
 
-void CLibCEC::SetInstance(CLibCEC *instance)
+bool CLibCEC::GetNextCommand(cec_command *command)
 {
-  if (g_libCEC_instance)
-    delete g_libCEC_instance;
-  g_libCEC_instance = instance;
+  return m_client ? m_client->GetNextCommand(command) : false;
 }
 
-void * CECInit(const char *strDeviceName, CEC::cec_device_type_list types, uint16_t UNUSED(iPhysicalAddress) /* = 0 */)
+cec_device_type CLibCEC::GetType(cec_logical_address address)
 {
-  CLibCEC *lib = new CLibCEC(strDeviceName, types);
-  CLibCEC::SetInstance(lib);
-  return static_cast< void* > (lib);
+  switch (address)
+  {
+    case CECDEVICE_AUDIOSYSTEM:
+      return CEC_DEVICE_TYPE_AUDIO_SYSTEM;
+    case CECDEVICE_PLAYBACKDEVICE1:
+    case CECDEVICE_PLAYBACKDEVICE2:
+    case CECDEVICE_PLAYBACKDEVICE3:
+      return CEC_DEVICE_TYPE_PLAYBACK_DEVICE;
+    case CECDEVICE_RECORDINGDEVICE1:
+    case CECDEVICE_RECORDINGDEVICE2:
+    case CECDEVICE_RECORDINGDEVICE3:
+      return CEC_DEVICE_TYPE_RECORDING_DEVICE;
+    case CECDEVICE_TUNER1:
+    case CECDEVICE_TUNER2:
+    case CECDEVICE_TUNER3:
+    case CECDEVICE_TUNER4:
+      return CEC_DEVICE_TYPE_TUNER;
+    case CECDEVICE_TV:
+      return CEC_DEVICE_TYPE_TV;
+    default:
+      return CEC_DEVICE_TYPE_RESERVED;
+  }
 }
 
-void * CECInitialise(libcec_configuration *configuration)
+uint16_t CLibCEC::GetMaskForType(cec_logical_address address)
 {
-  CLibCEC *lib = new CLibCEC(configuration);
-  CLibCEC::SetInstance(lib);
-  lib->GetCurrentConfiguration(configuration);
-  return static_cast< void* > (lib);
+  return GetMaskForType(GetType(address));
 }
 
-bool CECStartBootloader(void)
+uint16_t CLibCEC::GetMaskForType(cec_device_type type)
 {
-  bool bReturn(false);
-  cec_adapter deviceList[1];
-  if (CUSBCECAdapterDetection::FindAdapters(deviceList, 1) > 0)
+  switch (type)
   {
-    CUSBCECAdapterCommunication comm(NULL, deviceList[0].comm);
-    CTimeout timeout(CEC_DEFAULT_CONNECT_TIMEOUT);
-    while (timeout.TimeLeft() > 0 && (bReturn = comm.Open(timeout.TimeLeft() / CEC_CONNECT_TRIES, true)) == false)
+    case CEC_DEVICE_TYPE_AUDIO_SYSTEM:
     {
-      comm.Close();
-      CEvent::Sleep(500);
+      cec_logical_addresses addr;
+      addr.Clear();
+      addr.Set(CECDEVICE_AUDIOSYSTEM);
+      return addr.AckMask();
     }
-    if (comm.IsOpen())
-      bReturn = comm.StartBootloader();
+    case CEC_DEVICE_TYPE_PLAYBACK_DEVICE:
+    {
+      cec_logical_addresses addr;
+      addr.Clear();
+      addr.Set(CECDEVICE_PLAYBACKDEVICE1);
+      addr.Set(CECDEVICE_PLAYBACKDEVICE2);
+      addr.Set(CECDEVICE_PLAYBACKDEVICE3);
+      return addr.AckMask();
+    }
+    case CEC_DEVICE_TYPE_RECORDING_DEVICE:
+    {
+      cec_logical_addresses addr;
+      addr.Clear();
+      addr.Set(CECDEVICE_RECORDINGDEVICE1);
+      addr.Set(CECDEVICE_RECORDINGDEVICE2);
+      addr.Set(CECDEVICE_RECORDINGDEVICE3);
+      return addr.AckMask();
+    }
+    case CEC_DEVICE_TYPE_TUNER:
+    {
+      cec_logical_addresses addr;
+      addr.Clear();
+      addr.Set(CECDEVICE_TUNER1);
+      addr.Set(CECDEVICE_TUNER2);
+      addr.Set(CECDEVICE_TUNER3);
+      addr.Set(CECDEVICE_TUNER4);
+      return addr.AckMask();
+    }
+    case CEC_DEVICE_TYPE_TV:
+    {
+      cec_logical_addresses addr;
+      addr.Clear();
+      addr.Set(CECDEVICE_TV);
+      return addr.AckMask();
+    }
+    default:
+      return 0;
   }
+}
 
-  return bReturn;
+bool CLibCEC::IsValidPhysicalAddress(uint16_t iPhysicalAddress)
+{
+  return iPhysicalAddress >= CEC_MIN_PHYSICAL_ADDRESS &&
+         iPhysicalAddress <= CEC_MAX_PHYSICAL_ADDRESS;
 }
 
-void CECDestroy(CEC::ICECAdapter *UNUSED(instance))
+const char *CLibCEC::ToString(const cec_device_type type)
 {
-  CLibCEC::SetInstance(NULL);
+  switch (type)
+  {
+  case CEC_DEVICE_TYPE_AUDIO_SYSTEM:
+    return "audio system";
+  case CEC_DEVICE_TYPE_PLAYBACK_DEVICE:
+    return "playback device";
+  case CEC_DEVICE_TYPE_RECORDING_DEVICE:
+      return "recording device";
+  case CEC_DEVICE_TYPE_RESERVED:
+      return "reserved";
+  case CEC_DEVICE_TYPE_TUNER:
+      return "tuner";
+  case CEC_DEVICE_TYPE_TV:
+      return "TV";
+  default:
+    return "unknown";
+  }
 }
 
 const char *CLibCEC::ToString(const cec_menu_state state)
 {
-  return m_cec->ToString(state);
+  switch (state)
+  {
+  case CEC_MENU_STATE_ACTIVATED:
+    return "activated";
+  case CEC_MENU_STATE_DEACTIVATED:
+    return "deactivated";
+  default:
+    return "unknown";
+  }
 }
 
 const char *CLibCEC::ToString(const cec_version version)
 {
-  return m_cec->ToString(version);
+  switch (version)
+  {
+  case CEC_VERSION_1_2:
+    return "1.2";
+  case CEC_VERSION_1_2A:
+    return "1.2a";
+  case CEC_VERSION_1_3:
+    return "1.3";
+  case CEC_VERSION_1_3A:
+    return "1.3a";
+  case CEC_VERSION_1_4:
+    return "1.4";
+  default:
+    return "unknown";
+  }
 }
 
 const char *CLibCEC::ToString(const cec_power_status status)
 {
-  return m_cec->ToString(status);
+  switch (status)
+  {
+  case CEC_POWER_STATUS_ON:
+    return "on";
+  case CEC_POWER_STATUS_STANDBY:
+    return "standby";
+  case CEC_POWER_STATUS_IN_TRANSITION_ON_TO_STANDBY:
+    return "in transition from on to standby";
+  case CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON:
+    return "in transition from standby to on";
+  default:
+    return "unknown";
+  }
 }
 
 const char *CLibCEC::ToString(const cec_logical_address address)
 {
-  return m_cec->ToString(address);
+  switch(address)
+  {
+  case CECDEVICE_AUDIOSYSTEM:
+    return "Audio";
+  case CECDEVICE_BROADCAST:
+    return "Broadcast";
+  case CECDEVICE_FREEUSE:
+    return "Free use";
+  case CECDEVICE_PLAYBACKDEVICE1:
+    return "Playback 1";
+  case CECDEVICE_PLAYBACKDEVICE2:
+    return "Playback 2";
+  case CECDEVICE_PLAYBACKDEVICE3:
+    return "Playback 3";
+  case CECDEVICE_RECORDINGDEVICE1:
+    return "Recorder 1";
+  case CECDEVICE_RECORDINGDEVICE2:
+    return "Recorder 2";
+  case CECDEVICE_RECORDINGDEVICE3:
+    return "Recorder 3";
+  case CECDEVICE_RESERVED1:
+    return "Reserved 1";
+  case CECDEVICE_RESERVED2:
+    return "Reserved 2";
+  case CECDEVICE_TUNER1:
+    return "Tuner 1";
+  case CECDEVICE_TUNER2:
+    return "Tuner 2";
+  case CECDEVICE_TUNER3:
+    return "Tuner 3";
+  case CECDEVICE_TUNER4:
+    return "Tuner 4";
+  case CECDEVICE_TV:
+    return "TV";
+  default:
+    return "unknown";
+  }
 }
 
 const char *CLibCEC::ToString(const cec_deck_control_mode mode)
 {
-  return m_cec->ToString(mode);
+  switch (mode)
+  {
+  case CEC_DECK_CONTROL_MODE_SKIP_FORWARD_WIND:
+    return "skip forward wind";
+  case CEC_DECK_CONTROL_MODE_EJECT:
+    return "eject";
+  case CEC_DECK_CONTROL_MODE_SKIP_REVERSE_REWIND:
+    return "reverse rewind";
+  case CEC_DECK_CONTROL_MODE_STOP:
+    return "stop";
+  default:
+    return "unknown";
+  }
 }
 
 const char *CLibCEC::ToString(const cec_deck_info status)
 {
-  return m_cec->ToString(status);
+  switch (status)
+  {
+  case CEC_DECK_INFO_PLAY:
+    return "play";
+  case CEC_DECK_INFO_RECORD:
+    return "record";
+  case CEC_DECK_INFO_PLAY_REVERSE:
+    return "play reverse";
+  case CEC_DECK_INFO_STILL:
+    return "still";
+  case CEC_DECK_INFO_SLOW:
+    return "slow";
+  case CEC_DECK_INFO_SLOW_REVERSE:
+    return "slow reverse";
+  case CEC_DECK_INFO_FAST_FORWARD:
+    return "fast forward";
+  case CEC_DECK_INFO_FAST_REVERSE:
+    return "fast reverse";
+  case CEC_DECK_INFO_NO_MEDIA:
+    return "no media";
+  case CEC_DECK_INFO_STOP:
+    return "stop";
+  case CEC_DECK_INFO_SKIP_FORWARD_WIND:
+    return "info skip forward wind";
+  case CEC_DECK_INFO_SKIP_REVERSE_REWIND:
+    return "info skip reverse rewind";
+  case CEC_DECK_INFO_INDEX_SEARCH_FORWARD:
+    return "info index search forward";
+  case CEC_DECK_INFO_INDEX_SEARCH_REVERSE:
+    return "info index search reverse";
+  case CEC_DECK_INFO_OTHER_STATUS:
+    return "other";
+  case CEC_DECK_INFO_OTHER_STATUS_LG:
+    return "LG other";
+  default:
+    return "unknown";
+  }
 }
 
 const char *CLibCEC::ToString(const cec_opcode opcode)
 {
-  return m_cec->ToString(opcode);
+  switch (opcode)
+  {
+  case CEC_OPCODE_ACTIVE_SOURCE:
+    return "active source";
+  case CEC_OPCODE_IMAGE_VIEW_ON:
+    return "image view on";
+  case CEC_OPCODE_TEXT_VIEW_ON:
+    return "text view on";
+  case CEC_OPCODE_INACTIVE_SOURCE:
+    return "inactive source";
+  case CEC_OPCODE_REQUEST_ACTIVE_SOURCE:
+    return "request active source";
+  case CEC_OPCODE_ROUTING_CHANGE:
+    return "routing change";
+  case CEC_OPCODE_ROUTING_INFORMATION:
+    return "routing information";
+  case CEC_OPCODE_SET_STREAM_PATH:
+    return "set stream path";
+  case CEC_OPCODE_STANDBY:
+    return "standby";
+  case CEC_OPCODE_RECORD_OFF:
+    return "record off";
+  case CEC_OPCODE_RECORD_ON:
+    return "record on";
+  case CEC_OPCODE_RECORD_STATUS:
+    return "record status";
+  case CEC_OPCODE_RECORD_TV_SCREEN:
+    return "record tv screen";
+  case CEC_OPCODE_CLEAR_ANALOGUE_TIMER:
+    return "clear analogue timer";
+  case CEC_OPCODE_CLEAR_DIGITAL_TIMER:
+    return "clear digital timer";
+  case CEC_OPCODE_CLEAR_EXTERNAL_TIMER:
+    return "clear external timer";
+  case CEC_OPCODE_SET_ANALOGUE_TIMER:
+    return "set analogue timer";
+  case CEC_OPCODE_SET_DIGITAL_TIMER:
+    return "set digital timer";
+  case CEC_OPCODE_SET_EXTERNAL_TIMER:
+    return "set external timer";
+  case CEC_OPCODE_SET_TIMER_PROGRAM_TITLE:
+    return "set timer program title";
+  case CEC_OPCODE_TIMER_CLEARED_STATUS:
+    return "timer cleared status";
+  case CEC_OPCODE_TIMER_STATUS:
+    return "timer status";
+  case CEC_OPCODE_CEC_VERSION:
+    return "cec version";
+  case CEC_OPCODE_GET_CEC_VERSION:
+    return "get cec version";
+  case CEC_OPCODE_GIVE_PHYSICAL_ADDRESS:
+    return "give physical address";
+  case CEC_OPCODE_GET_MENU_LANGUAGE:
+    return "get menu language";
+  case CEC_OPCODE_REPORT_PHYSICAL_ADDRESS:
+    return "report physical address";
+  case CEC_OPCODE_SET_MENU_LANGUAGE:
+    return "set menu language";
+  case CEC_OPCODE_DECK_CONTROL:
+    return "deck control";
+  case CEC_OPCODE_DECK_STATUS:
+    return "deck status";
+  case CEC_OPCODE_GIVE_DECK_STATUS:
+    return "give deck status";
+  case CEC_OPCODE_PLAY:
+    return "play";
+  case CEC_OPCODE_GIVE_TUNER_DEVICE_STATUS:
+    return "give tuner status";
+  case CEC_OPCODE_SELECT_ANALOGUE_SERVICE:
+    return "select analogue service";
+  case CEC_OPCODE_SELECT_DIGITAL_SERVICE:
+    return "set digital service";
+  case CEC_OPCODE_TUNER_DEVICE_STATUS:
+    return "tuner device status";
+  case CEC_OPCODE_TUNER_STEP_DECREMENT:
+    return "tuner step decrement";
+  case CEC_OPCODE_TUNER_STEP_INCREMENT:
+    return "tuner step increment";
+  case CEC_OPCODE_DEVICE_VENDOR_ID:
+    return "device vendor id";
+  case CEC_OPCODE_GIVE_DEVICE_VENDOR_ID:
+    return "give device vendor id";
+  case CEC_OPCODE_VENDOR_COMMAND:
+    return "vendor command";
+  case CEC_OPCODE_VENDOR_COMMAND_WITH_ID:
+    return "vendor command with id";
+  case CEC_OPCODE_VENDOR_REMOTE_BUTTON_DOWN:
+    return "vendor remote button down";
+  case CEC_OPCODE_VENDOR_REMOTE_BUTTON_UP:
+    return "vendor remote button up";
+  case CEC_OPCODE_SET_OSD_STRING:
+    return "set osd string";
+  case CEC_OPCODE_GIVE_OSD_NAME:
+    return "give osd name";
+  case CEC_OPCODE_SET_OSD_NAME:
+    return "set osd name";
+  case CEC_OPCODE_MENU_REQUEST:
+    return "menu request";
+  case CEC_OPCODE_MENU_STATUS:
+    return "menu status";
+  case CEC_OPCODE_USER_CONTROL_PRESSED:
+    return "user control pressed";
+  case CEC_OPCODE_USER_CONTROL_RELEASE:
+    return "user control release";
+  case CEC_OPCODE_GIVE_DEVICE_POWER_STATUS:
+    return "give device power status";
+  case CEC_OPCODE_REPORT_POWER_STATUS:
+    return "report power status";
+  case CEC_OPCODE_FEATURE_ABORT:
+    return "feature abort";
+  case CEC_OPCODE_ABORT:
+    return "abort";
+  case CEC_OPCODE_GIVE_AUDIO_STATUS:
+    return "give audio status";
+  case CEC_OPCODE_GIVE_SYSTEM_AUDIO_MODE_STATUS:
+    return "give audio mode status";
+  case CEC_OPCODE_REPORT_AUDIO_STATUS:
+    return "report audio status";
+  case CEC_OPCODE_SET_SYSTEM_AUDIO_MODE:
+    return "set system audio mode";
+  case CEC_OPCODE_SYSTEM_AUDIO_MODE_REQUEST:
+    return "system audio mode request";
+  case CEC_OPCODE_SYSTEM_AUDIO_MODE_STATUS:
+    return "system audio mode status";
+  case CEC_OPCODE_SET_AUDIO_RATE:
+    return "set audio rate";
+  case CEC_OPCODE_START_ARC:
+    return "start ARC";
+  case CEC_OPCODE_REPORT_ARC_STARTED:
+    return "report ARC started";
+  case CEC_OPCODE_REPORT_ARC_ENDED:
+    return "report ARC ended";
+  case CEC_OPCODE_REQUEST_ARC_START:
+    return "request ARC start";
+  case CEC_OPCODE_REQUEST_ARC_END:
+    return "request ARC end";
+  case CEC_OPCODE_END_ARC:
+    return "end ARC";
+  case CEC_OPCODE_CDC:
+    return "CDC";
+  case CEC_OPCODE_NONE:
+    return "poll";
+  default:
+    return "UNKNOWN";
+  }
 }
 
 const char *CLibCEC::ToString(const cec_system_audio_status mode)
 {
-  return m_cec->ToString(mode);
+  switch(mode)
+  {
+  case CEC_SYSTEM_AUDIO_STATUS_ON:
+    return "on";
+  case CEC_SYSTEM_AUDIO_STATUS_OFF:
+    return "off";
+  default:
+    return "unknown";
+  }
 }
 
-const char *CLibCEC::ToString(const cec_audio_status status)
+const char *CLibCEC::ToString(const cec_audio_status UNUSED(status))
 {
-  return m_cec->ToString(status);
+  // TODO this is a mask
+  return "TODO";
 }
 
 const char *CLibCEC::ToString(const cec_vendor_id vendor)
 {
-  return m_cec->ToString(vendor);
+  switch (vendor)
+  {
+  case CEC_VENDOR_SAMSUNG:
+    return "Samsung";
+  case CEC_VENDOR_LG:
+    return "LG";
+  case CEC_VENDOR_PANASONIC:
+    return "Panasonic";
+  case CEC_VENDOR_PIONEER:
+    return "Pioneer";
+  case CEC_VENDOR_ONKYO:
+    return "Onkyo";
+  case CEC_VENDOR_YAMAHA:
+    return "Yamaha";
+  case CEC_VENDOR_PHILIPS:
+    return "Philips";
+  case CEC_VENDOR_SONY:
+    return "Sony";
+  case CEC_VENDOR_TOSHIBA:
+    return "Toshiba";
+  default:
+    return "Unknown";
+  }
 }
 
 const char *CLibCEC::ToString(const cec_client_version version)
 {
-  return m_cec->ToString(version);
+  switch (version)
+  {
+  case CEC_CLIENT_VERSION_PRE_1_5:
+    return "pre-1.5";
+  case CEC_CLIENT_VERSION_1_5_0:
+    return "1.5.0";
+  case CEC_CLIENT_VERSION_1_5_1:
+    return "1.5.1";
+  case CEC_CLIENT_VERSION_1_5_2:
+    return "1.5.2";
+  case CEC_CLIENT_VERSION_1_5_3:
+    return "1.5.3";
+  case CEC_CLIENT_VERSION_1_6_0:
+    return "1.6.0";
+  case CEC_CLIENT_VERSION_1_6_1:
+    return "1.6.1";
+  case CEC_CLIENT_VERSION_1_6_2:
+    return "1.6.2";
+  default:
+    return "Unknown";
+  }
 }
 
 const char *CLibCEC::ToString(const cec_server_version version)
 {
-  return m_cec->ToString(version);
+  switch (version)
+  {
+  case CEC_SERVER_VERSION_PRE_1_5:
+    return "pre-1.5";
+  case CEC_SERVER_VERSION_1_5_0:
+    return "1.5.0";
+  case CEC_SERVER_VERSION_1_5_1:
+    return "1.5.1";
+  case CEC_SERVER_VERSION_1_5_2:
+    return "1.5.2";
+  case CEC_SERVER_VERSION_1_5_3:
+    return "1.5.3";
+  case CEC_SERVER_VERSION_1_6_0:
+    return "1.6.0";
+  case CEC_SERVER_VERSION_1_6_1:
+    return "1.6.1";
+  case CEC_SERVER_VERSION_1_6_2:
+    return "1.6.2";
+  default:
+    return "Unknown";
+  }
 }
 
-const char *CLibCEC::ToString(const cec_device_type type)
+void CLibCEC::CheckKeypressTimeout(void)
 {
-  return m_cec->ToString(type);
+  // check all clients
+  for (vector<CCECClient *>::iterator it = m_clients.begin(); it != m_clients.end(); it++)
+    (*it)->CheckKeypressTimeout();
 }
 
-bool CLibCEC::GetCurrentConfiguration(libcec_configuration *configuration)
+void CLibCEC::AddLog(const cec_log_level level, const char *strFormat, ...)
 {
-  return m_cec->GetCurrentConfiguration(configuration);
+  CStdString strLog;
+
+  va_list argList;
+  va_start(argList, strFormat);
+  strLog.FormatV(strFormat, argList);
+  va_end(argList);
+
+  cec_log_message message;
+  message.level = level;
+  message.time = GetTimeMs() - m_iStartTime;
+  snprintf(message.message, sizeof(message.message), "%s", strLog.c_str());
+
+  // send the message to all clients
+  for (vector<CCECClient *>::iterator it = m_clients.begin(); it != m_clients.end(); it++)
+    (*it)->AddLog(message);
 }
 
-bool CLibCEC::SetConfiguration(const libcec_configuration *configuration)
+void CLibCEC::Alert(const libcec_alert type, const libcec_parameter &param)
 {
-  return m_cec->SetConfiguration(configuration);
+  // send the alert to all clients
+  for (vector<CCECClient *>::iterator it = m_clients.begin(); it != m_clients.end(); it++)
+    (*it)->Alert(type, param);
 }
 
-bool CLibCEC::CanPersistConfiguration(void)
+bool CLibCEC::SetActiveView(void)
 {
-  return m_cec->CanPersistConfiguration();
+  AddLog(CEC_LOG_WARNING, "deprecated method %s called", __FUNCTION__);
+  return SetActiveSource();
 }
 
-bool CLibCEC::PersistConfiguration(libcec_configuration *configuration)
+bool CLibCEC::EnablePhysicalAddressDetection(void)
 {
-  return m_cec->PersistConfiguration(configuration);
+  AddLog(CEC_LOG_WARNING, "deprecated method %s called", __FUNCTION__);
+  return true;
 }
 
-void CLibCEC::RescanActiveDevices(void)
+CCECClient *CLibCEC::RegisterClient(libcec_configuration *configuration)
 {
-  return m_cec->RescanActiveDevices();
+  if (!m_cec)
+    return NULL;
+
+  CCECClient *newClient = new CCECClient(m_cec, configuration);
+  if (!newClient)
+    return NULL;
+
+  m_clients.push_back(newClient);
+  if (!m_client)
+    m_client = newClient;
+
+  if (m_cec->IsRunning())
+    m_cec->RegisterClient(newClient);
+
+  return m_client;
 }
 
-bool CLibCEC::IsLibCECActiveSource(void)
+void CLibCEC::UnregisterClients(void)
 {
-  bool bReturn(false);
-  if (m_cec)
-  {
-    cec_logical_address activeSource = m_cec->GetActiveSource();
-    if (activeSource != CECDEVICE_UNKNOWN)
-      bReturn = m_cec->m_busDevices[activeSource]->GetStatus(false) == CEC_DEVICE_STATUS_HANDLED_BY_LIBCEC;
-  }
-  return bReturn;
+  m_clients.clear();
+  delete m_client;
+  m_client = NULL;
 }
 
-cec_device_type CLibCEC::GetType(cec_logical_address address)
+void * CECInitialise(libcec_configuration *configuration)
 {
-  switch (address)
-  {
-    case CECDEVICE_AUDIOSYSTEM:
-      return CEC_DEVICE_TYPE_AUDIO_SYSTEM;
-    case CECDEVICE_PLAYBACKDEVICE1:
-    case CECDEVICE_PLAYBACKDEVICE2:
-    case CECDEVICE_PLAYBACKDEVICE3:
-      return CEC_DEVICE_TYPE_PLAYBACK_DEVICE;
-    case CECDEVICE_RECORDINGDEVICE1:
-    case CECDEVICE_RECORDINGDEVICE2:
-    case CECDEVICE_RECORDINGDEVICE3:
-      return CEC_DEVICE_TYPE_RECORDING_DEVICE;
-    case CECDEVICE_TUNER1:
-    case CECDEVICE_TUNER2:
-    case CECDEVICE_TUNER3:
-    case CECDEVICE_TUNER4:
-      return CEC_DEVICE_TYPE_TUNER;
-    case CECDEVICE_TV:
-      return CEC_DEVICE_TYPE_TV;
-    default:
-      return CEC_DEVICE_TYPE_RESERVED;
-  }
+  if (!configuration)
+    return NULL;
+
+  CLibCEC *lib = new CLibCEC;
+  if (lib)
+    lib->RegisterClient(configuration);
+
+  return static_cast< void* > (lib);
 }
 
-uint16_t CLibCEC::GetMaskForType(cec_logical_address address)
+void * CECInit(const char *strDeviceName, CEC::cec_device_type_list types, uint16_t iPhysicalAddress /* = 0 */)
 {
-  return GetMaskForType(GetType(address));
+  libcec_configuration configuration;
+  configuration.serverVersion = LIBCEC_VERSION_CURRENT;
+
+  // client version < 1.5.0
+  snprintf(configuration.strDeviceName, 13, "%s", strDeviceName);
+  configuration.deviceTypes      = types;
+  configuration.iPhysicalAddress = iPhysicalAddress;
+
+  if (configuration.deviceTypes.IsEmpty())
+    configuration.deviceTypes.Add(CEC_DEVICE_TYPE_RECORDING_DEVICE);
+
+  return CECInitialise(&configuration);
 }
 
-uint16_t CLibCEC::GetMaskForType(cec_device_type type)
+bool CECStartBootloader(void)
 {
-  switch (type)
+  bool bReturn(false);
+  cec_adapter deviceList[1];
+  if (CUSBCECAdapterDetection::FindAdapters(deviceList, 1) > 0)
   {
-    case CEC_DEVICE_TYPE_AUDIO_SYSTEM:
-    {
-      cec_logical_addresses addr;
-      addr.Clear();
-      addr.Set(CECDEVICE_AUDIOSYSTEM);
-      return addr.AckMask();
-    }
-    case CEC_DEVICE_TYPE_PLAYBACK_DEVICE:
-    {
-      cec_logical_addresses addr;
-      addr.Clear();
-      addr.Set(CECDEVICE_PLAYBACKDEVICE1);
-      addr.Set(CECDEVICE_PLAYBACKDEVICE2);
-      addr.Set(CECDEVICE_PLAYBACKDEVICE3);
-      return addr.AckMask();
-    }
-    case CEC_DEVICE_TYPE_RECORDING_DEVICE:
-    {
-      cec_logical_addresses addr;
-      addr.Clear();
-      addr.Set(CECDEVICE_RECORDINGDEVICE1);
-      addr.Set(CECDEVICE_RECORDINGDEVICE2);
-      addr.Set(CECDEVICE_RECORDINGDEVICE3);
-      return addr.AckMask();
-    }
-    case CEC_DEVICE_TYPE_TUNER:
-    {
-      cec_logical_addresses addr;
-      addr.Clear();
-      addr.Set(CECDEVICE_TUNER1);
-      addr.Set(CECDEVICE_TUNER2);
-      addr.Set(CECDEVICE_TUNER3);
-      addr.Set(CECDEVICE_TUNER4);
-      return addr.AckMask();
-    }
-    case CEC_DEVICE_TYPE_TV:
+    CUSBCECAdapterCommunication comm(NULL, deviceList[0].comm);
+    CTimeout timeout(CEC_DEFAULT_CONNECT_TIMEOUT);
+    while (timeout.TimeLeft() > 0 && (bReturn = comm.Open(timeout.TimeLeft() / CEC_CONNECT_TRIES, true)) == false)
     {
-      cec_logical_addresses addr;
-      addr.Clear();
-      addr.Set(CECDEVICE_TV);
-      return addr.AckMask();
+      comm.Close();
+      CEvent::Sleep(500);
     }
-    default:
-      return 0;
+    if (comm.IsOpen())
+      bReturn = comm.StartBootloader();
   }
+
+  return bReturn;
+}
+
+void CECDestroy(CEC::ICECAdapter *instance)
+{
+  delete instance;
 }
 
 bool CLibCEC::GetDeviceInformation(const char *strPort, libcec_configuration *config, uint32_t iTimeoutMs /* = CEC_DEFAULT_CONNECT_TIMEOUT */)
 {
   if (m_cec->IsRunning())
     return false;
-  
+
   return m_cec->GetDeviceInformation(strPort, config, iTimeoutMs);
 }