#include "cectypes.h"
+#define LIBCEC_VERSION_CURRENT CEC_SERVER_VERSION_1_8_2
+
namespace CEC
{
class ICECAdapter
/*!
* @brief Open a connection to the CEC adapter.
* @param strPort The path to the port.
- * @param iTimeout Connection timeout in ms.
+ * @param iTimeoutMs Connection timeout in ms.
* @return True when connected, false otherwise.
*/
virtual bool Open(const char *strPort, uint32_t iTimeoutMs = 10000) = 0;
*/
virtual void Close(void) = 0;
+// XXX XBMC Eden for Windows has been built against 1.2.0 and Ubuntu against 1.5.2
+// we accidently broke the abi between these versions, and this will ensure the upgrade will still work
+#if !defined(_WIN32) && !defined(_WIN64)
/*!
* @brief Set and enable the callback methods. If this method is not called, the GetNext...() methods will have to be used.
* @param cbParam Parameter to pass to callback methods.
* @return True when enabled, false otherwise.
*/
virtual bool EnableCallbacks(void *cbParam, ICECCallbacks *callbacks) = 0;
+#endif
/*!
* @brief Try to find all connected CEC adapters. Only implemented on Linux and Windows at the moment.
virtual bool StartBootloader(void) = 0;
//@}
+ /*!
+ * @deprecated Use libcec_configuration instead
+ * @return Get the minimal version of libcec that this version of libcec can interface with.
+ */
+ virtual int8_t GetMinLibVersion(void) const = 0;
+
+ /*!
+ * @deprecated Use libcec_configuration instead
+ * @return Get the major version of libcec.
+ */
+ virtual int8_t GetLibVersionMajor(void) const = 0;
+
+ /*!
+ * @deprecated Use libcec_configuration instead
+ * @return Get the minor version of libcec.
+ */
+ virtual int8_t GetLibVersionMinor(void) const = 0;
+
+ /*!
+ * @deprecated Use callback methods instead
+ * @brief Get the next log message in the queue, if there is one.
+ * @param message The next message.
+ * @return True if a message was passed, false otherwise.
+ */
+ virtual bool GetNextLogMessage(cec_log_message *message) = 0;
+
+ /*!
+ * @deprecated Use callback methods instead
+ * @brief Get the next keypress in the queue, if there is one.
+ * @param key The next keypress.
+ * @return True if a key was passed, false otherwise.
+ */
+ virtual bool GetNextKeypress(cec_keypress *key) = 0;
+
+ /*!
+ * @deprecated Use callback methods instead
+ * @brief Get the next CEC command that was received by the adapter.
+ * @param command The next command.
+ * @return True when a command was passed, false otherwise.
+ */
+ virtual bool GetNextCommand(cec_command *command) = 0;
+
/*!
* @brief Transmit a command over the CEC line.
* @param data The command to send.
*/
virtual bool SetPhysicalAddress(uint16_t iPhysicalAddress = CEC_DEFAULT_PHYSICAL_ADDRESS) = 0;
+// XXX XBMC Eden for Windows has been built against 1.2.0 and Ubuntu against 1.5.2
+// we accidently broke the abi between these versions, and this will ensure the upgrade will still work
+#if !defined(_WIN32) && !defined(_WIN64)
+ /*!
+ * @deprecated Use libcec_configuration instead.
+ * @brief Enable physical address detection (if the connected adapter supports this).
+ * @return True when physical address detection was enabled, false otherwise.
+ */
+ virtual bool EnablePhysicalAddressDetection(void) = 0;
+
/*!
* @brief Changes the active HDMI port.
* @param iBaseDevice The device to which this libcec is connected.
* @return True when changed, false otherwise.
*/
virtual bool SetHDMIPort(cec_logical_address iBaseDevice, uint8_t iPort) = 0;
+#endif
/*!
* @brief Power on the connected CEC capable devices.
*/
virtual bool SetActiveSource(cec_device_type type = CEC_DEVICE_TYPE_RESERVED) = 0;
+ /*!
+ * @deprecated Use SetActiveSource() instead
+ */
+ virtual bool SetActiveView(void) = 0;
+
/*!
* @brief Change the deck control mode, if this adapter is registered as playback device.
* @param mode The new control mode.
/*!
* @brief Change the deck info, if this adapter is a playback device.
* @param info The new deck info.
+ * @param bSendUpdate True to send the status over the CEC line.
* @return True if set, false otherwise.
*/
virtual bool SetDeckInfo(cec_deck_info info, bool bSendUpdate = true) = 0;
/*!
* @brief Display a message on the device with the given logical address.
- * @param iLogicalAddres The device to display the message on.
+ * @param iLogicalAddress The device to display the message on.
* @param duration The duration of the message
* @param strMessage The message to display.
* @return True when the command was sent, false otherwise.
* @param iLogicalAddress The device to get the CEC version for.
* @return The version or CEC_VERSION_UNKNOWN when the version couldn't be fetched.
*/
- virtual cec_version GetDeviceCecVersion(cec_logical_address iAddress) = 0;
+ virtual cec_version GetDeviceCecVersion(cec_logical_address iLogicalAddress) = 0;
/*!
* @brief Get the menu language of the device with the given logical address
* @param language The requested menu language.
* @return True when fetched succesfully, false otherwise.
*/
- virtual bool GetDeviceMenuLanguage(cec_logical_address iAddress, cec_menu_language *language) = 0;
+ virtual bool GetDeviceMenuLanguage(cec_logical_address iLogicalAddress, cec_menu_language *language) = 0;
/*!
* @brief Get the vendor ID of the device with the given logical address.
* @param iLogicalAddress The device to get the vendor id for.
* @return The vendor ID or 0 if it wasn't found.
*/
- virtual uint64_t GetDeviceVendorId(cec_logical_address iAddress) = 0;
+ virtual uint64_t GetDeviceVendorId(cec_logical_address iLogicalAddress) = 0;
/*!
* @brief Get the power status of the device with the given logical address.
* @param iLogicalAddress The device to get the power status for.
* @return The power status or CEC_POWER_STATUS_UNKNOWN if it wasn't found.
*/
- virtual cec_power_status GetDevicePowerStatus(cec_logical_address iAddress) = 0;
+ virtual cec_power_status GetDevicePowerStatus(cec_logical_address iLogicalAddress) = 0;
+// XXX XBMC Eden for Windows has been built against 1.2.0 and Ubuntu against 1.5.2
+// we accidently broke the abi between these versions, and this will ensure the upgrade will still work
+#if !defined(_WIN32) && !defined(_WIN64)
/*!
* @brief Get the physical address of the device with the given logical address.
* @param iLogicalAddress The device to get the vendor id for.
* @return The physical address or 0 if it wasn't found.
*/
- virtual uint16_t GetDevicePhysicalAddress(cec_logical_address iAddress) = 0;
+ virtual uint16_t GetDevicePhysicalAddress(cec_logical_address iLogicalAddress) = 0;
+#endif
/*!
* @brief Sends a POLL message to a device.
- * @param iAddress The device to send the message to.
+ * @param iLogicalAddress The device to send the message to.
* @return True if the POLL was acked, false otherwise.
*/
- virtual bool PollDevice(cec_logical_address iAddress) = 0;
+ virtual bool PollDevice(cec_logical_address iLogicalAddress) = 0;
/*!
* @return The devices that are active on the bus and not handled by libcec.
*/
virtual cec_logical_addresses GetActiveDevices(void) = 0;
- /*!
- * @brief Tell libCEC to poll for active devices on the bus.
- */
- virtual void RescanActiveDevices(void) = 0;
-
/*!
* @brief Check whether a device is active on the bus.
- * @param iAddress The address to check.
+ * @param iLogicalAddress The address to check.
* @return True when active, false otherwise.
*/
- virtual bool IsActiveDevice(cec_logical_address iAddress) = 0;
+ virtual bool IsActiveDevice(cec_logical_address iLogicalAddress) = 0;
/*!
* @brief Check whether a device of the given type is active on the bus.
/*!
* @brief Get the OSD name of a device on the CEC bus.
- * @param iAddress The device to get the OSD name for.
+ * @param iLogicalAddress The device to get the OSD name for.
* @return The OSD name.
*/
- virtual cec_osd_name GetDeviceOSDName(cec_logical_address iAddress) = 0;
+ virtual cec_osd_name GetDeviceOSDName(cec_logical_address iLogicalAddress) = 0;
/*!
* @brief Get the logical address of the device that is currently the active source on the CEC bus.
/*!
* @brief Check whether a device is currently the active source on the CEC bus.
- * @param iAddress The address to check.
+ * @param iLogicalAddress The address to check.
* @return True when it is the active source, false otherwise.
*/
- virtual bool IsActiveSource(cec_logical_address iAddress) = 0;
+ virtual bool IsActiveSource(cec_logical_address iLogicalAddress) = 0;
/*!
* @brief Sets the stream path to the device on the given logical address.
- * @param iAddress The address to activate.
+ * @param iLogicalAddress The address to activate.
* @return True when the command was sent, false otherwise.
*/
- virtual bool SetStreamPath(cec_logical_address iAddress) = 0;
+ virtual bool SetStreamPath(cec_logical_address iLogicalAddress) = 0;
/*!
* @brief Sets the stream path to the device on the given logical address.
*/
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;
+ virtual const char *ToString(const cec_logical_address address) = 0;
+ virtual const char *ToString(const cec_deck_control_mode mode) = 0;
+ virtual const char *ToString(const cec_deck_info status) = 0;
+ virtual const char *ToString(const cec_opcode opcode) = 0;
+ virtual const char *ToString(const cec_system_audio_status mode) = 0;
+ virtual const char *ToString(const cec_audio_status status) = 0;
+ virtual const char *ToString(const cec_vendor_id vendor) = 0;
+ virtual const char *ToString(const cec_client_version version) = 0;
+ virtual const char *ToString(const cec_server_version version) = 0;
+
/*!
* @brief Get libCEC's current configuration.
* @param configuration The configuration.
*/
virtual bool PersistConfiguration(libcec_configuration *configuration) = 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;
- virtual const char *ToString(const cec_logical_address address) = 0;
- virtual const char *ToString(const cec_deck_control_mode mode) = 0;
- virtual const char *ToString(const cec_deck_info status) = 0;
- virtual const char *ToString(const cec_opcode opcode) = 0;
- virtual const char *ToString(const cec_system_audio_status mode) = 0;
- virtual const char *ToString(const cec_audio_status status) = 0;
- virtual const char *ToString(const cec_vendor_id vendor) = 0;
- virtual const char *ToString(const cec_client_version version) = 0;
- virtual const char *ToString(const cec_server_version version) = 0;
+ /*!
+ * @brief Tell libCEC to poll for active devices on the bus.
+ */
+ virtual void RescanActiveDevices(void) = 0;
- ////// deprecated methods, may be removed in a future version //////
+ /*!
+ * @return true when libCEC is the active source on the bus, false otherwise.
+ */
+ virtual bool IsLibCECActiveSource(void) = 0;
/*!
- * @deprecated Use libcec_configuration instead.
- * @brief Enable physical address detection (if the connected adapter supports this).
- * @return True when physical address detection was enabled, false otherwise.
+ * @brief Get information about the given device
+ * @param strPort The port to which the device is connected
+ * @param config The device configuration
+ * @param iTimeoutMs The timeout in milliseconds
+ * @return True when the device was found, false otherwise
*/
- virtual bool EnablePhysicalAddressDetection(void) = 0;
+ virtual bool GetDeviceInformation(const char *strPort, libcec_configuration *config, uint32_t iTimeoutMs = 10000) = 0;
+// XXX XBMC Eden for Windows has been built against 1.2.0 and Ubuntu against 1.5.2
+// we accidently broke the abi between these versions, and this will ensure the upgrade will still work
+#if defined(_WIN32) || defined(_WIN64)
/*!
- * @deprecated Use SetActiveSource() instead
+ * @brief Set and enable the callback methods. If this method is not called, the GetNext...() methods will have to be used.
+ * @param cbParam Parameter to pass to callback methods.
+ * @param callbacks The callbacks to set.
+ * @return True when enabled, false otherwise.
*/
- virtual bool SetActiveView(void) = 0;
+ virtual bool EnableCallbacks(void *cbParam, ICECCallbacks *callbacks) = 0;
/*!
- * @deprecated Use libcec_configuration instead
- * @return Get the minimal version of libcec that this version of libcec can interface with.
+ * @deprecated Use libcec_configuration instead.
+ * @brief Enable physical address detection (if the connected adapter supports this).
+ * @return True when physical address detection was enabled, false otherwise.
*/
- virtual int8_t GetMinLibVersion(void) const = 0;
+ virtual bool EnablePhysicalAddressDetection(void) = 0;
/*!
- * @deprecated Use libcec_configuration instead
- * @return Get the major version of libcec.
+ * @brief Changes the active HDMI port.
+ * @param iBaseDevice The device to which this libcec is connected.
+ * @param iPort The new port number.
+ * @return True when changed, false otherwise.
*/
- virtual int8_t GetLibVersionMajor(void) const = 0;
+ virtual bool SetHDMIPort(cec_logical_address iBaseDevice, uint8_t iPort) = 0;
/*!
- * @deprecated Use libcec_configuration instead
- * @return Get the minor version of libcec.
+ * @brief Get the physical address of the device with the given logical address.
+ * @param iLogicalAddress The device to get the vendor id for.
+ * @return The physical address or 0 if it wasn't found.
*/
- virtual int8_t GetLibVersionMinor(void) const = 0;
+ virtual uint16_t GetDevicePhysicalAddress(cec_logical_address iLogicalAddress) = 0;
+#endif
/*!
- * @deprecated Use callback methods instead
- * @brief Get the next log message in the queue, if there is one.
- * @param message The next message.
- * @return True if a message was passed, false otherwise.
+ * @return A string with information about how libCEC was compiled.
*/
- virtual bool GetNextLogMessage(cec_log_message *message) = 0;
+ virtual const char *GetLibInfo(void) = 0;
- /*!
- * @deprecated Use callback methods instead
- * @brief Get the next keypress in the queue, if there is one.
- * @param key The next keypress.
- * @return True if a key was passed, false otherwise.
- */
- virtual bool GetNextKeypress(cec_keypress *key) = 0;
+ virtual const char *ToString(const cec_user_control_code key) = 0;
/*!
- * @deprecated Use callback methods instead
- * @brief Get the next CEC command that was received by the adapter.
- * @param action The next command.
- * @return True when a command was passed, false otherwise.
+ * @brief Calling this method will initialise the host on which libCEC is running.
+ * Calling this method will initialise the host on which libCEC is running. On the RPi, it calls
+ * bcm_host_init(), which may only be called once per process, and is called by any process using
+ * the video api on that system. So only call this method if libCEC is used in an application that
+ * does not already initialise the video api.
+ *
+ * Should be called as first call to libCEC, directly after CECInitialise() and before using Open()
*/
- virtual bool GetNextCommand(cec_command *command) = 0;
+ virtual void InitVideoStandalone(void) = 0;
+ virtual const char *ToString(const cec_adapter_type type) = 0;
};
};
* @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 deviceTypes, uint16_t iPhysicalAddress = 0);
+extern "C" DECLSPEC void * CECInit(const char *strDeviceName, CEC::cec_device_type_list deviceTypes);
+
+/*!
+ * @deprecated
+ */
+extern "C" DECLSPEC void * CECCreate(const char *strDeviceName, CEC::cec_logical_address iLogicalAddress = CEC::CECDEVICE_PLAYBACKDEVICE1, uint16_t iPhysicalAddress = CEC_DEFAULT_PHYSICAL_ADDRESS);
+
+/*!
+ * @brief Unload the CEC adapter library.
+ */
+extern "C" DECLSPEC void CECDestroy(CEC::ICECAdapter *instance);
/*!
* @brief Load the CEC adapter library.
extern "C" DECLSPEC void * CECInitialise(CEC::libcec_configuration *configuration);
/*!
- * @brief Unload the CEC adapter library.
+ * @brief Try to connect to the adapter and send the "start bootloader" command, without initialising libCEC and going through all checks
+ * @return True when the command was send, false otherwise.
*/
-extern "C" DECLSPEC void CECDestroy(CEC::ICECAdapter *instance);
+extern "C" DECLSPEC bool CECStartBootloader(void);
#endif /* CECEXPORTS_H_ */
repositories / deb_libcec.git / blobdiff