From: Lars Op den Kamp Date: Thu, 16 Feb 2012 13:54:21 +0000 (+0100) Subject: cec: restore the order in the headers X-Git-Tag: upstream/2.2.0~1^2~35^2~22 X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=dc2c98f66b29c8be6bc342cf24c9f7a9091e66ab;p=deb_libcec.git cec: restore the order in the headers --- diff --git a/include/cec.h b/include/cec.h index b159117..a3a674e 100644 --- a/include/cec.h +++ b/include/cec.h @@ -88,6 +88,48 @@ namespace CEC 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 action 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. @@ -109,6 +151,13 @@ namespace CEC */ virtual bool SetPhysicalAddress(uint16_t iPhysicalAddress = CEC_DEFAULT_PHYSICAL_ADDRESS) = 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. + */ + virtual bool EnablePhysicalAddressDetection(void) = 0; + /*! * @brief Changes the active HDMI port. * @param iBaseDevice The device to which this libcec is connected. @@ -138,6 +187,11 @@ namespace CEC */ 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. @@ -231,11 +285,6 @@ namespace CEC */ 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. @@ -327,6 +376,19 @@ namespace CEC */ 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. @@ -353,75 +415,10 @@ namespace CEC */ 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; - - ////// deprecated methods, may be removed in a future version ////// - /*! - * @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; - - /*! - * @deprecated Use SetActiveSource() instead - */ - virtual bool SetActiveView(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 action The next command. - * @return True when a command was passed, false otherwise. + * @brief Tell libCEC to poll for active devices on the bus. */ - virtual bool GetNextCommand(cec_command *command) = 0; - + virtual void RescanActiveDevices(void) = 0; }; }; diff --git a/include/cecc.h b/include/cecc.h index f2928ed..22fb9a3 100644 --- a/include/cecc.h +++ b/include/cecc.h @@ -74,6 +74,12 @@ extern DECLSPEC int cec_ping_adapters(void); extern DECLSPEC int cec_start_bootloader(void); +extern DECLSPEC int8_t cec_get_min_lib_version(void); + +extern DECLSPEC int8_t cec_get_lib_version_major(void); + +extern DECLSPEC int8_t cec_get_lib_version_minor(void); + #ifdef __cplusplus extern DECLSPEC int cec_power_on_devices(CEC::cec_logical_address address); #else @@ -86,6 +92,8 @@ extern DECLSPEC int cec_standby_devices(CEC::cec_logical_address address); extern DECLSPEC int cec_standby_devices(cec_logical_address address); #endif +extern DECLSPEC int cec_set_active_view(void); + #ifdef __cplusplus extern DECLSPEC int cec_set_active_source(CEC::cec_device_type type); #else @@ -112,6 +120,24 @@ extern DECLSPEC int cec_set_menu_state(CEC::cec_menu_state state, int bSendUpdat extern DECLSPEC int cec_set_menu_state(cec_menu_state state, int bSendUpdate); #endif +#ifdef __cplusplus +extern DECLSPEC int cec_get_next_log_message(CEC::cec_log_message *message); +#else +extern DECLSPEC int cec_get_next_log_message(cec_log_message *message); +#endif + +#ifdef __cplusplus +extern DECLSPEC int cec_get_next_keypress(CEC::cec_keypress *key); +#else +extern DECLSPEC int cec_get_next_keypress(cec_keypress *key); +#endif + +#ifdef __cplusplus +extern DECLSPEC int cec_get_next_command(CEC::cec_command *command); +#else +extern DECLSPEC int cec_get_next_command(cec_command *command); +#endif + #ifdef __cplusplus extern DECLSPEC int cec_transmit(const CEC::cec_command *data); #else @@ -230,6 +256,8 @@ extern DECLSPEC CEC::cec_osd_name cec_get_device_osd_name(CEC::cec_logical_addre extern DECLSPEC cec_osd_name cec_get_device_osd_name(cec_logical_address iAddress); #endif +extern DECLSPEC int cec_enable_physical_address_detection(void); + #ifdef __cplusplus extern DECLSPEC int cec_set_stream_path_logical(CEC::cec_logical_address iAddress); #else @@ -266,36 +294,6 @@ extern DECLSPEC int cec_set_configuration(const libcec_configuration *configurat extern DECLSPEC void cec_rescan_devices(void); -////// deprecated methods, may be removed in a future version ////// - -extern DECLSPEC int cec_enable_physical_address_detection(void); - -extern DECLSPEC int cec_set_active_view(void); - -extern DECLSPEC int8_t cec_get_min_lib_version(void); - -extern DECLSPEC int8_t cec_get_lib_version_major(void); - -extern DECLSPEC int8_t cec_get_lib_version_minor(void); - -#ifdef __cplusplus -extern DECLSPEC int cec_get_next_log_message(CEC::cec_log_message *message); -#else -extern DECLSPEC int cec_get_next_log_message(cec_log_message *message); -#endif - -#ifdef __cplusplus -extern DECLSPEC int cec_get_next_keypress(CEC::cec_keypress *key); -#else -extern DECLSPEC int cec_get_next_keypress(cec_keypress *key); -#endif - -#ifdef __cplusplus -extern DECLSPEC int cec_get_next_command(CEC::cec_command *command); -#else -extern DECLSPEC int cec_get_next_command(cec_command *command); -#endif - #ifdef __cplusplus }; #endif