m_callbacks(NULL),
m_cbParam(NULL)
{
- m_cec = new CCECProcessor(this, strDeviceName, types, iPhysicalAddress, CEC_CLIENT_VERSION_PRE_1_5);
+ m_cec = new CCECProcessor(this, strDeviceName, types, iPhysicalAddress);
}
-CLibCEC::CLibCEC(const libcec_configuration *configuration) :
+CLibCEC::CLibCEC(libcec_configuration *configuration) :
m_iStartTime(GetTimeMs()),
m_iCurrentButton(CEC_USER_CONTROL_CODE_UNKNOWN),
m_buttontime(0),
bool CLibCEC::PowerOnDevices(cec_logical_address address /* = CECDEVICE_TV */)
{
- return m_cec && address >= CECDEVICE_TV && address <= CECDEVICE_BROADCAST ? m_cec->m_busDevices[(uint8_t)address]->PowerOn() : false;
+ return m_cec && address >= CECDEVICE_TV && address <= CECDEVICE_BROADCAST ? m_cec->PowerOnDevices(address) : false;
}
bool CLibCEC::StandbyDevices(cec_logical_address address /* = CECDEVICE_BROADCAST */)
{
- return m_cec && address >= CECDEVICE_TV && address <= CECDEVICE_BROADCAST ? m_cec->m_busDevices[(uint8_t)address]->Standby() : false;
+ return m_cec && address >= CECDEVICE_TV && address <= CECDEVICE_BROADCAST ? m_cec->StandbyDevices(address) : false;
}
bool CLibCEC::SetActiveSource(cec_device_type type /* = CEC_DEVICE_TYPE_RESERVED */)
return retVal;
}
-void CLibCEC::AddLog(cec_log_level level, const char *strFormat, ...)
+void CLibCEC::AddLog(const cec_log_level level, const char *strFormat, ...)
{
CStdString strLog;
instance->m_logBuffer.Push(message);
}
-void CLibCEC::AddKey(cec_keypress &key)
+void CLibCEC::AddKey(const cec_keypress &key)
{
CLibCEC *instance = CLibCEC::GetInstance();
CLockObject lock(instance->m_mutex);
instance->m_buttontime = key.duration > 0 ? 0 : GetTimeMs();
}
+void CLibCEC::ConfigurationChanged(const libcec_configuration &config)
+{
+ 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);
+}
+
void CLibCEC::SetCurrentButton(cec_user_control_code iButtonCode)
{
/* push keypress to the keybuffer with 0 duration.
return static_cast< void* > (lib);
}
-void * CECInitialise(const libcec_configuration *configuration)
+void * CECInitialise(libcec_configuration *configuration)
{
CLibCEC *lib = new CLibCEC(configuration);
CLibCEC::SetInstance(lib);
{
return m_cec->ToString(version);
}
+
+const char *CLibCEC::ToString(const cec_server_version version)
+{
+ return m_cec->ToString(version);
+}
+
+bool CLibCEC::GetCurrentConfiguration(libcec_configuration *configuration)
+{
+ return m_cec->GetCurrentConfiguration(configuration);
+}
+
+bool CLibCEC::SetConfiguration(const libcec_configuration *configuration)
+{
+ return m_cec->SetConfiguration(configuration);
+}
+
+bool CLibCEC::CanPersistConfiguration(void)
+{
+ return m_cec->CanPersistConfiguration();
+}
+
+bool CLibCEC::PersistConfiguration(libcec_configuration *configuration)
+{
+ return m_cec->PersistConfiguration(configuration);
+}
+
+void CLibCEC::RescanActiveDevices(void)
+{
+ return m_cec->RescanActiveDevices();
+}
+
+bool CLibCEC::IsLibCECActiveSource(void)
+{
+ return m_cec ?
+ m_cec->m_busDevices[m_cec->GetActiveSource()]->GetStatus(false) == CEC_DEVICE_STATUS_HANDLED_BY_LIBCEC :
+ false;
+}