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),
m_cbParam(configuration->callbackParam)
{
m_cec = new CCECProcessor(this, configuration);
+ configuration->serverVersion = CEC_SERVER_VERSION_1_5_0;
}
CLibCEC::~CLibCEC(void)
if (instance->m_callbacks &&
config.clientVersion >= CEC_CLIENT_VERSION_1_5_0 &&
- instance->m_callbacks->CBCecConfigurationChanged != NULL)
+ instance->m_callbacks->CBCecConfigurationChanged != NULL &&
+ instance->m_cec->IsInitialised())
instance->m_callbacks->CBCecConfigurationChanged(instance->m_cbParam, config);
}
g_libCEC_instance = instance;
}
-void * CECInit(const char *strDeviceName, CEC::cec_device_type_list types, uint16_t iPhysicalAddress /* = 0 */)
+void * CECInit(const char *strDeviceName, CEC::cec_device_type_list types, uint16_t UNUSED(iPhysicalAddress) /* = 0 */)
{
CLibCEC *lib = new CLibCEC(strDeviceName, types);
CLibCEC::SetInstance(lib);
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);
+ return m_cec->IsInitialised() && m_cec->GetCurrentConfiguration(configuration);
}
bool CLibCEC::SetConfiguration(const 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;
+}