X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=include%2Fcec.h;h=9f152068627dfd6cc737145d623a2944d01407da;hb=610647374e568337e7d79b99c102dea370dde52c;hp=97e75a46f8e778b7d05471c9ea1e3f58afa81c97;hpb=f42d3e0fb1f63456b87232019d9cce731acad640;p=deb_libcec.git diff --git a/include/cec.h b/include/cec.h index 97e75a4..9f15206 100644 --- a/include/cec.h +++ b/include/cec.h @@ -34,7 +34,7 @@ #ifndef CECEXPORTS_H_ #define CECEXPORTS_H_ -#include +#include "cectypes.h" namespace CEC { @@ -364,6 +364,11 @@ namespace CEC */ virtual bool SetStreamPath(uint16_t iPhysicalAddress) = 0; + /*! + * @return The list of addresses that libCEC is controlling + */ + virtual cec_logical_addresses GetLogicalAddresses(void) = 0; + virtual const char *ToString(const cec_menu_state state) = 0; virtual const char *ToString(const cec_version version) = 0; virtual const char *ToString(const cec_power_status status) = 0; @@ -381,19 +386,10 @@ namespace CEC * @brief Load the CEC adapter library. * @param strDeviceName How to present this device to other devices. * @param deviceTypes The device types to use on the CEC bus. + * @param iPhysicalAddress The physical address to assume on the bus. If set to 0, libCEC will try to autodetect the address, with the data provided via SetHDMIPort() * @return An instance of ICECAdapter or NULL on error. */ -extern "C" DECLSPEC void * CECInit(const char *strDeviceName, CEC::cec_device_type_list devicesTypes); - -/*! - * @deprecated Please use CECInit() instead - * @brief Load the CEC adapter library. - * @param strDeviceName How to present this device to other devices. - * @param iLogicalAddress The logical of this device. PLAYBACKDEVICE1 by default. - * @param iPhysicalAddress The physical address of this device. 0x1000 by default. - * @return An instance of ICECAdapter or NULL on error. - */ -extern "C" DECLSPEC void * CECCreate(const char *strDeviceName, CEC::cec_logical_address iLogicalAddress = CEC::CECDEVICE_PLAYBACKDEVICE1, uint16_t iPhysicalAddress = CEC_DEFAULT_PHYSICAL_ADDRESS); +extern "C" DECLSPEC void * CECInit(const char *strDeviceName, CEC::cec_device_type_list devicesTypes, uint16_t iPhysicalAddress = 0); /*! * @brief Unload the CEC adapter library.