/*
* This file is part of the libCEC(R) library.
*
- * libCEC(R) is Copyright (C) 2011-2012 Pulse-Eight Limited. All rights reserved.
+ * libCEC(R) is Copyright (C) 2011-2013 Pulse-Eight Limited. All rights reserved.
* libCEC(R) is an original work, containing original code.
*
* libCEC(R) is a trademark of Pulse-Eight Limited.
* http://www.pulse-eight.net/
*/
+#include "env.h"
#include "LibCEC.h"
-#include "adapter/USBCECAdapterDetection.h"
+#include "adapter/AdapterFactory.h"
+#include "adapter/AdapterCommunication.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 "platform/util/util.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) :
+CLibCEC::CLibCEC(void) :
m_iStartTime(GetTimeMs()),
- m_iCurrentButton(CEC_USER_CONTROL_CODE_UNKNOWN),
- m_buttontime(0),
- m_callbacks(configuration->callbacks),
- m_cbParam(configuration->callbackParam)
+ m_client(NULL)
{
- m_cec = new CCECProcessor(this, configuration);
+ m_cec = new CCECProcessor(this);
}
CLibCEC::~CLibCEC(void)
{
- Close();
- delete m_cec;
+ // unregister all clients client
+ UnregisterClients();
+
+ // delete the adapter connection
+ DELETE_AND_NULL(m_cec);
}
-bool CLibCEC::Open(const char *strPort, uint32_t iTimeoutMs /* = 10000 */)
+bool CLibCEC::Open(const char *strPort, uint32_t iTimeoutMs /* = CEC_DEFAULT_CONNECT_TIMEOUT */)
{
- if (m_cec->IsRunning())
- {
- AddLog(CEC_LOG_ERROR, "connection already open");
+ if (!m_cec || !strPort)
return false;
- }
- if (!m_cec->Start(strPort, 38400, iTimeoutMs))
+ // open a new connection
+ if (!m_cec->Start(strPort, CEC_SERIAL_DEFAULT_BAUDRATE, iTimeoutMs))
{
AddLog(CEC_LOG_ERROR, "could not start CEC communications");
return false;
}
+ // register all clients
+ 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();
-}
+ if (!m_cec)
+ return;
-bool CLibCEC::EnableCallbacks(void *cbParam, ICECCallbacks *callbacks)
-{
- CLockObject lock(m_mutex);
- if (m_cec)
- {
- m_cbParam = cbParam;
- m_callbacks = callbacks;
- }
- return false;
+ // unregister all clients
+ m_cec->UnregisterClients();
+
+ // close the connection
+ m_cec->Close();
}
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 CAdapterFactory(this).FindAdapters(deviceList, iBufSize, strDevicePath);
+}
- return CUSBCECAdapterDetection::FindAdapters(deviceList, iBufSize, strDevicePath);
+bool CLibCEC::StartBootloader(void)
+{
+ return m_cec ? m_cec->StartBootloader() : false;
}
bool CLibCEC::PingAdapter(void)
{
- return m_cec ? m_cec->PingAdapter() : false;
+ return m_client ? m_client->PingAdapter() : false;
}
-bool CLibCEC::StartBootloader(void)
+bool CLibCEC::EnableCallbacks(void *cbParam, ICECCallbacks *callbacks)
{
- return m_cec ? m_cec->StartBootloader() : false;
+ return m_client ? m_client->EnableCallbacks(cbParam, callbacks) : false;
}
-bool CLibCEC::GetNextLogMessage(cec_log_message *message)
+bool CLibCEC::GetCurrentConfiguration(libcec_configuration *configuration)
{
- return (m_logBuffer.Pop(*message));
+ return m_client ? m_client->GetCurrentConfiguration(*configuration) : false;
}
-bool CLibCEC::GetNextKeypress(cec_keypress *key)
+bool CLibCEC::SetConfiguration(const libcec_configuration *configuration)
{
- return m_keyBuffer.Pop(*key);
+ return m_client ? m_client->SetConfiguration(*configuration) : false;
}
-bool CLibCEC::GetNextCommand(cec_command *command)
+bool CLibCEC::CanPersistConfiguration(void)
{
- return m_commandBuffer.Pop(*command);
+ return m_client ? m_client->CanPersistConfiguration() : false;
+}
+
+bool CLibCEC::PersistConfiguration(libcec_configuration *configuration)
+{
+ return m_client ? m_client->PersistConfiguration(*configuration) : false;
+}
+
+void CLibCEC::RescanActiveDevices(void)
+{
+ if (m_client)
+ m_client->RescanActiveDevices();
+}
+
+bool CLibCEC::IsLibCECActiveSource(void)
+{
+ return m_client ? m_client->IsLibCECActiveSource() : false;
}
bool CLibCEC::Transmit(const cec_command &data)
{
- return m_cec ? m_cec->Transmit(data) : false;
+ return m_client ? m_client->Transmit(data, false) : false;
}
bool CLibCEC::SetLogicalAddress(cec_logical_address iLogicalAddress)
{
- return m_cec ? m_cec->SetLogicalAddress(iLogicalAddress) : false;
+ return m_client ? m_client->SetLogicalAddress(iLogicalAddress) : false;
}
bool CLibCEC::SetPhysicalAddress(uint16_t iPhysicalAddress /* = CEC_DEFAULT_PHYSICAL_ADDRESS */)
{
- return m_cec ? m_cec->SetPhysicalAddress(iPhysicalAddress) : false;
+ return m_client ? m_client->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;
+ return m_client ? m_client->SetHDMIPort(iBaseDevice, iPort) : false;
}
bool CLibCEC::PowerOnDevices(cec_logical_address address /* = CECDEVICE_TV */)
{
- return m_cec && address >= CECDEVICE_TV && address <= CECDEVICE_BROADCAST ? m_cec->PowerOnDevices(address) : false;
+ return m_client ? m_client->SendPowerOnDevices(address) : false;
}
bool CLibCEC::StandbyDevices(cec_logical_address address /* = CECDEVICE_BROADCAST */)
{
- return m_cec && address >= CECDEVICE_TV && address <= CECDEVICE_BROADCAST ? m_cec->StandbyDevices(address) : false;
+ return m_client ? m_client->SendStandbyDevices(address) : false;
}
bool CLibCEC::SetActiveSource(cec_device_type type /* = CEC_DEVICE_TYPE_RESERVED */)
{
- return m_cec ? m_cec->SetActiveSource(type) : false;
-}
-
-bool CLibCEC::SetActiveView(void)
-{
- return m_cec ? m_cec->SetActiveView() : false;
+ return m_client ? m_client->SendSetActiveSource(type) : false;
}
bool CLibCEC::SetDeckControlMode(cec_deck_control_mode mode, bool bSendUpdate /* = true */)
{
- return m_cec ? m_cec->SetDeckControlMode(mode, bSendUpdate) : false;
+ return m_client ? m_client->SendSetDeckControlMode(mode, bSendUpdate) : false;
}
bool CLibCEC::SetDeckInfo(cec_deck_info info, bool bSendUpdate /* = true */)
{
- return m_cec ? m_cec->SetDeckInfo(info, bSendUpdate) : false;
+ return m_client ? m_client->SendSetDeckInfo(info, bSendUpdate) : false;
}
bool CLibCEC::SetInactiveView(void)
{
- return m_cec ? m_cec->TransmitInactiveSource() : false;
+ return m_client ? m_client->SendSetInactiveView() : false;
}
bool CLibCEC::SetMenuState(cec_menu_state state, bool bSendUpdate /* = true */)
{
- return m_cec ? m_cec->SetMenuState(state, bSendUpdate) : false;
+ return m_client ? m_client->SendSetMenuState(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;
+ return m_client ? m_client->SendSetOSDString(iLogicalAddress, duration, strMessage) : false;
}
bool CLibCEC::SwitchMonitoring(bool bEnable)
{
- return m_cec ? m_cec->SwitchMonitoring(bEnable) : false;
+ return m_client ? m_client->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;
+ return m_client ? m_client->GetDeviceCecVersion(iAddress) : 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;
+ return m_client ? m_client->GetDeviceMenuLanguage(iAddress, *language) : 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;
+ return m_client ? m_client->GetDeviceVendorId(iAddress) : (uint64_t)CEC_VENDOR_UNKNOWN;
}
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;
+ return m_client ? m_client->GetDevicePhysicalAddress(iAddress) : CEC_INVALID_PHYSICAL_ADDRESS;
}
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;
+ return m_client ? m_client->GetDevicePowerStatus(iAddress) : 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;
+ return m_client ? m_client->PollDevice(iAddress) : false;
}
cec_logical_addresses CLibCEC::GetActiveDevices(void)
{
cec_logical_addresses addresses;
addresses.Clear();
- if (m_cec)
- addresses = m_cec->GetActiveDevices();
+ if (m_client)
+ addresses = m_client->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;
+ return m_client ? m_client->IsActiveDevice(iAddress) : 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;
+ return m_client ? m_client->IsActiveDeviceType(type) : false;
}
uint8_t CLibCEC::VolumeUp(bool bSendRelease /* = true */)
{
- if (m_cec)
- return m_cec->VolumeUp(bSendRelease);
- return 0;
+ return m_client ? m_client->SendVolumeUp(bSendRelease) : (uint8_t)CEC_AUDIO_VOLUME_STATUS_UNKNOWN;
}
uint8_t CLibCEC::VolumeDown(bool bSendRelease /* = true */)
{
- if (m_cec)
- return m_cec->VolumeDown(bSendRelease);
- return 0;
+ return m_client ? m_client->SendVolumeDown(bSendRelease) : (uint8_t)CEC_AUDIO_VOLUME_STATUS_UNKNOWN;
}
-
-uint8_t CLibCEC::MuteAudio(bool bSendRelease /* = true */)
+uint8_t CLibCEC::MuteAudio(bool UNUSED(bSendRelease) /* = true */)
{
- if (m_cec)
- return m_cec->MuteAudio(bSendRelease);
- return 0;
+ AddLog(CEC_LOG_WARNING, "deprecated function called: %s", __FUNCTION__);
+ return m_client ? m_client->SendMuteAudio() : (uint8_t)CEC_AUDIO_VOLUME_STATUS_UNKNOWN;
}
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;
+ return m_client ? m_client->SendKeypress(iDestination, key, bWait) : false;
}
bool CLibCEC::SendKeyRelease(cec_logical_address iDestination, bool bWait /* = true */)
{
- if (m_cec)
- return m_cec->TransmitKeyRelease(iDestination, bWait);
- return false;
+ return m_client ? m_client->SendKeyRelease(iDestination, bWait) : 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);
+ retVal.device = CECDEVICE_UNKNOWN;
+ memset(retVal.name, 0, 14);
+ if (m_client)
+ retVal = m_client->GetDeviceOSDName(iAddress);
return retVal;
}
-void CLibCEC::AddLog(const cec_log_level level, const char *strFormat, ...)
+cec_logical_address CLibCEC::GetActiveSource(void)
{
- CStdString strLog;
-
- va_list argList;
- va_start(argList, strFormat);
- strLog.FormatV(strFormat, argList);
- va_end(argList);
-
- CLibCEC *instance = CLibCEC::GetInstance();
- CLockObject lock(instance->m_mutex);
-
- 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_cbParam, message);
- else
- instance->m_logBuffer.Push(message);
+ return m_client ? m_client->GetActiveSource() : CECDEVICE_UNKNOWN;
}
-void CLibCEC::AddKey(const cec_keypress &key)
+bool CLibCEC::IsActiveSource(cec_logical_address iAddress)
{
- CLibCEC *instance = CLibCEC::GetInstance();
- CLockObject lock(instance->m_mutex);
-
- AddLog(CEC_LOG_DEBUG, "key pressed: %1x", key.keycode);
-
- if (instance->m_callbacks)
- 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->IsActiveSource(iAddress) : false;
}
-
-void CLibCEC::ConfigurationChanged(const libcec_configuration &config)
+bool CLibCEC::SetStreamPath(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 != NULL)
- instance->m_callbacks->CBCecConfigurationChanged(instance->m_cbParam, config);
+ return m_client ? m_client->SetStreamPath(iAddress) : false;
}
-void CLibCEC::SetCurrentButton(cec_user_control_code iButtonCode)
+bool CLibCEC::SetStreamPath(uint16_t iPhysicalAddress)
{
- /* 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->SetStreamPath(iPhysicalAddress) : false;
}
-void CLibCEC::AddKey(void)
+cec_logical_addresses CLibCEC::GetLogicalAddresses(void)
{
- CLibCEC *instance = CLibCEC::GetInstance();
- 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_cbParam, key);
- else
- instance->m_keyBuffer.Push(key);
- instance->m_iCurrentButton = CEC_USER_CONTROL_CODE_UNKNOWN;
- }
- instance->m_buttontime = 0;
+ cec_logical_addresses addresses;
+ addresses.Clear();
+ if (m_client)
+ addresses = m_client->GetLogicalAddresses();
+ return addresses;
}
-void CLibCEC::AddCommand(const cec_command &command)
+cec_device_type CLibCEC::GetType(cec_logical_address address)
{
- CLibCEC *instance = CLibCEC::GetInstance();
- 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_cbParam, command);
- else if (!instance->m_commandBuffer.Push(command))
- AddLog(CEC_LOG_WARNING, "command buffer is full");
+ return CCECTypeUtils::GetType(address);
}
-void CLibCEC::CheckKeypressTimeout(void)
+uint16_t CLibCEC::GetMaskForType(cec_logical_address address)
{
- if (m_iCurrentButton != CEC_USER_CONTROL_CODE_UNKNOWN && GetTimeMs() - m_buttontime > CEC_BUTTON_TIMEOUT)
- {
- AddKey();
- m_iCurrentButton = CEC_USER_CONTROL_CODE_UNKNOWN;
- }
+ return CCECTypeUtils::GetMaskForType(address);
}
-bool CLibCEC::SetStreamPath(cec_logical_address iAddress)
+uint16_t CLibCEC::GetMaskForType(cec_device_type type)
{
- uint16_t iPhysicalAddress = GetDevicePhysicalAddress(iAddress);
- if (iPhysicalAddress != 0xFFFF)
- return SetStreamPath(iPhysicalAddress);
- return false;
+ return CCECTypeUtils::GetMaskForType(type);
}
-bool CLibCEC::SetStreamPath(uint16_t iPhysicalAddress)
+bool CLibCEC::IsValidPhysicalAddress(uint16_t iPhysicalAddress)
{
- return m_cec->SetStreamPath(iPhysicalAddress);
+ return iPhysicalAddress >= CEC_MIN_PHYSICAL_ADDRESS &&
+ iPhysicalAddress <= CEC_MAX_PHYSICAL_ADDRESS;
}
-cec_logical_addresses CLibCEC::GetLogicalAddresses(void)
+void CLibCEC::CheckKeypressTimeout(void)
{
- cec_logical_addresses addr = m_cec->GetLogicalAddresses();
- return addr;
+ // check all clients
+ for (vector<CCECClient *>::iterator it = m_clients.begin(); it != m_clients.end(); it++)
+ (*it)->CheckKeypressTimeout();
}
-static CLibCEC *g_libCEC_instance(NULL);
-CLibCEC *CLibCEC::GetInstance(void)
+void CLibCEC::AddLog(const cec_log_level level, const char *strFormat, ...)
{
- return g_libCEC_instance;
-}
+ CStdString strLog;
-void CLibCEC::SetInstance(CLibCEC *instance)
-{
- if (g_libCEC_instance)
- delete g_libCEC_instance;
- g_libCEC_instance = instance;
-}
+ // format the message
+ va_list argList;
+ va_start(argList, strFormat);
+ strLog.FormatV(strFormat, argList);
+ va_end(argList);
-void * CECInit(const char *strDeviceName, CEC::cec_device_type_list types, uint16_t iPhysicalAddress /* = 0 */)
-{
- CLibCEC *lib = new CLibCEC(strDeviceName, types);
- CLibCEC::SetInstance(lib);
- return static_cast< void* > (lib);
-}
+ cec_log_message message;
+ message.level = level;
+ message.time = GetTimeMs() - m_iStartTime;
+ snprintf(message.message, sizeof(message.message), "%s", strLog.c_str());
-void * CECInitialise(libcec_configuration *configuration)
-{
- CLibCEC *lib = new CLibCEC(configuration);
- CLibCEC::SetInstance(lib);
- return static_cast< void* > (lib);
+ // send the message to all clients
+ for (vector<CCECClient *>::iterator it = m_clients.begin(); it != m_clients.end(); it++)
+ (*it)->AddLog(message);
}
-void CECDestroy(CEC::ICECAdapter *UNUSED(instance))
+void CLibCEC::AddCommand(const cec_command &command)
{
- CLibCEC::SetInstance(NULL);
+ // send the command to all clients
+ for (vector<CCECClient *>::iterator it = m_clients.begin(); it != m_clients.end(); it++)
+ (*it)->AddCommand(command);
}
-const char *CLibCEC::ToString(const cec_menu_state state)
+void CLibCEC::Alert(const libcec_alert type, const libcec_parameter ¶m)
{
- return m_cec->ToString(state);
+ // send the alert to all clients
+ for (vector<CCECClient *>::iterator it = m_clients.begin(); it != m_clients.end(); it++)
+ (*it)->Alert(type, param);
}
-const char *CLibCEC::ToString(const cec_version version)
+CCECClient *CLibCEC::RegisterClient(libcec_configuration &configuration)
{
- return m_cec->ToString(version);
-}
+ if (!m_cec)
+ return NULL;
-const char *CLibCEC::ToString(const cec_power_status status)
-{
- return m_cec->ToString(status);
+ // create a new client instance
+ CCECClient *newClient = new CCECClient(m_cec, configuration);
+ if (!newClient)
+ return NULL;
+ m_clients.push_back(newClient);
+
+ // if the default client isn't set, set it
+ if (!m_client)
+ m_client = newClient;
+
+ // register the new client
+ if (m_cec->CECInitialised())
+ m_cec->RegisterClient(newClient);
+
+ return newClient;
}
-const char *CLibCEC::ToString(const cec_logical_address address)
+void CLibCEC::UnregisterClients(void)
{
- return m_cec->ToString(address);
+ if (m_cec && m_cec->IsRunning())
+ m_cec->UnregisterClients();
+
+ m_clients.clear();
+
+ DELETE_AND_NULL(m_client);
}
-const char *CLibCEC::ToString(const cec_deck_control_mode mode)
+void * CECInitialise(libcec_configuration *configuration)
{
- return m_cec->ToString(mode);
+ if (!configuration)
+ return NULL;
+
+ // create a new libCEC instance
+ CLibCEC *lib = new CLibCEC;
+
+ // register a new client
+ CCECClient *client(NULL);
+ if (lib && configuration)
+ client = lib->RegisterClient(*configuration);
+
+ // update the current configuration
+ if (client)
+ client->GetCurrentConfiguration(*configuration);
+
+ // ensure that the correct server version is set
+ configuration->serverVersion = LIBCEC_VERSION_CURRENT;
+
+ return static_cast< void* > (lib);
}
-const char *CLibCEC::ToString(const cec_deck_info status)
+void * CECInit(const char *strDeviceName, CEC::cec_device_type_list types)
{
- return m_cec->ToString(status);
+ libcec_configuration configuration; configuration.Clear();
+
+ // client version < 1.5.0
+ snprintf(configuration.strDeviceName, 13, "%s", strDeviceName);
+ configuration.deviceTypes = types;
+ configuration.iPhysicalAddress = CEC_INVALID_PHYSICAL_ADDRESS;
+
+ if (configuration.deviceTypes.IsEmpty())
+ configuration.deviceTypes.Add(CEC_DEVICE_TYPE_RECORDING_DEVICE);
+
+ return CECInitialise(&configuration);
}
-const char *CLibCEC::ToString(const cec_opcode opcode)
+bool CECStartBootloader(void)
{
- return m_cec->ToString(opcode);
+ bool bReturn(false);
+ cec_adapter deviceList[1];
+ if (CAdapterFactory(NULL).FindAdapters(deviceList, 1, 0) > 0)
+ {
+ CAdapterFactory factory(NULL);
+ IAdapterCommunication *comm = factory.GetInstance(deviceList[0].comm);
+ if (comm)
+ {
+ CTimeout timeout(CEC_DEFAULT_CONNECT_TIMEOUT);
+ while (timeout.TimeLeft() > 0 &&
+ (bReturn = comm->Open(timeout.TimeLeft() / CEC_CONNECT_TRIES, true)) == false)
+ {
+ comm->Close();
+ CEvent::Sleep(500);
+ }
+ if (comm->IsOpen())
+ bReturn = comm->StartBootloader();
+
+ delete comm;
+ }
+ }
+
+ return bReturn;
}
-const char *CLibCEC::ToString(const cec_system_audio_status mode)
+void CECDestroy(CEC::ICECAdapter *instance)
{
- return m_cec->ToString(mode);
+ DELETE_AND_NULL(instance);
}
-const char *CLibCEC::ToString(const cec_audio_status status)
+bool CLibCEC::GetDeviceInformation(const char *strPort, libcec_configuration *config, uint32_t iTimeoutMs /* = CEC_DEFAULT_CONNECT_TIMEOUT */)
{
- return m_cec->ToString(status);
+ if (m_cec->IsRunning())
+ return false;
+
+ return m_cec->GetDeviceInformation(strPort, config, iTimeoutMs);
}
-const char *CLibCEC::ToString(const cec_vendor_id vendor)
+const char *CLibCEC::GetLibInfo(void)
{
- return m_cec->ToString(vendor);
+#ifndef LIB_INFO
+#ifdef _WIN32
+#define FEATURES "'P8 USB' 'P8 USB detect'"
+#ifdef _WIN64
+#define HOST_TYPE "Windows (x64)"
+#else
+#define HOST_TYPE "Windows (x86)"
+#endif
+#else
+#define HOST_TYPE "unknown"
+#define FEATURES "unknown"
+#endif
+
+ return "host: " HOST_TYPE ", features: " FEATURES ", compiled: " __DATE__;
+#else
+ return LIB_INFO;
+#endif
}
-const char *CLibCEC::ToString(const cec_client_version version)
+void CLibCEC::InitVideoStandalone(void)
{
- return m_cec->ToString(version);
+ CAdapterFactory::InitVideoStandalone();
}
-
-const char *CLibCEC::ToString(const cec_server_version version)
+uint16_t CLibCEC::GetAdapterVendorId(void) const
{
- return m_cec->ToString(version);
+ return m_cec && m_cec->IsRunning() ? m_cec->GetAdapterVendorId() : 0;
}
-bool CLibCEC::GetCurrentConfiguration(libcec_configuration *configuration)
+uint16_t CLibCEC::GetAdapterProductId(void) const
{
- return m_cec->GetCurrentConfiguration(configuration);
+ return m_cec && m_cec->IsRunning() ? m_cec->GetAdapterProductId() : 0;
}
-bool CLibCEC::SetConfiguration(const libcec_configuration *configuration)
+uint8_t CLibCEC::AudioToggleMute(void)
{
- return m_cec->SetConfiguration(configuration);
+ return m_client ? m_client->AudioToggleMute() : (uint8_t)CEC_AUDIO_VOLUME_STATUS_UNKNOWN;
}
-bool CLibCEC::CanPersistConfiguration(void)
+uint8_t CLibCEC::AudioMute(void)
{
- return m_cec->CanPersistConfiguration();
+ return m_client ? m_client->AudioMute() : (uint8_t)CEC_AUDIO_VOLUME_STATUS_UNKNOWN;
}
-bool CLibCEC::PersistConfiguration(libcec_configuration *configuration)
+uint8_t CLibCEC::AudioUnmute(void)
{
- return m_cec->PersistConfiguration(configuration);
+ return m_client ? m_client->AudioUnmute() : (uint8_t)CEC_AUDIO_VOLUME_STATUS_UNKNOWN;
}
-void CLibCEC::RescanActiveDevices(void)
+uint8_t CLibCEC::AudioStatus(void)
{
- return m_cec->RescanActiveDevices();
+ return m_client ? m_client->AudioStatus() : (uint8_t)CEC_AUDIO_VOLUME_STATUS_UNKNOWN;
}
-bool CLibCEC::IsLibCECActiveSource(void)
+int8_t CLibCEC::DetectAdapters(cec_adapter_descriptor *deviceList, uint8_t iBufSize, const char *strDevicePath /* = NULL */, bool bQuickScan /* = false */)
{
- return m_cec ?
- m_cec->m_busDevices[m_cec->GetActiveSource()]->GetStatus(false) == CEC_DEVICE_STATUS_HANDLED_BY_LIBCEC :
- false;
+ int8_t iAdaptersFound = CAdapterFactory(this).DetectAdapters(deviceList, iBufSize, strDevicePath);
+ if (!bQuickScan)
+ {
+ for (int8_t iPtr = 0; iPtr < iAdaptersFound; iPtr++)
+ {
+ libcec_configuration config;
+ GetDeviceInformation(deviceList[iPtr].strComName, &config);
+ deviceList[iPtr].iFirmwareVersion = config.iFirmwareVersion;
+ deviceList[iPtr].iPhysicalAddress = config.iPhysicalAddress;
+ deviceList[iPtr].iFirmwareBuildDate = config.iFirmwareBuildDate;
+ deviceList[iPtr].adapterType = config.adapterType;
+ }
+ }
+ return iAdaptersFound;
}
repositories / deb_libcec.git / blobdiff