removed deprecated methods and fields

[deb_libcec.git] / include / cectypes.h

diff --git a/include/cectypes.h b/include/cectypes.h
index 2f06aeb15c08375695951b8ee17e2fa04b70e19d..621e19f97e6c6a70615feff5e24d8aeded3f1b07 100644 (file)
--- a/include/cectypes.h
+++ b/include/cectypes.h
@@ -643,6 +643,7 @@ typedef enum cec_vendor_id
   CEC_VENDOR_SHARP     = 0x08001F,
   CEC_VENDOR_VIZIO     = 0x6B746D,
   CEC_VENDOR_BROADCOM  = 0x18C086,
+  CEC_VENDOR_LOEWE     = 0x000982,
    
   CEC_VENDOR_UNKNOWN   = 0
 } cec_vendor_id;
@@ -769,11 +770,10 @@ typedef struct cec_command
   int32_t             transmit_timeout; /**< the timeout to use in ms */
 
 #ifdef __cplusplus
-  // @todo re-add in v2.0 (breaks ABI)
-  //cec_command(void)
-  //{
-  //  Clear();
-  //}
+  cec_command(void)
+  {
+    Clear();
+  }
 
   cec_command &operator =(const struct cec_command &command)
   {
@@ -895,18 +895,6 @@ typedef struct cec_device_type_list
   cec_device_type types[5]; /**< the list of device types */
 
 #ifdef __cplusplus
-  /*!
-   * @deprecated Use Clear() instead.
-   * @brief Clear this list.
-   */
-  void clear(void) { Clear(); }
-  /*!
-   * @deprecated Use Add() instead.
-   * @brief Add a type to this list.
-   * @param type The type to add.
-   */
-  void add(const cec_device_type type) { Add(type); }
-
   /*!
    * @brief Clear this list.
    */
@@ -1096,11 +1084,11 @@ typedef struct libcec_parameter
 
 typedef struct libcec_configuration libcec_configuration;
 
-typedef int (CEC_CDECL* CBCecLogMessageType)(void *param, const cec_log_message);
-typedef int (CEC_CDECL* CBCecKeyPressType)(void *param, const cec_keypress);
-typedef int (CEC_CDECL* CBCecCommandType)(void *param, const cec_command);
-typedef int (CEC_CDECL* CBCecConfigurationChangedType)(void *param, const libcec_configuration);
-typedef int (CEC_CDECL* CBCecAlertType)(void *param, const libcec_alert, const libcec_parameter);
+typedef int (CEC_CDECL* CBCecLogMessageType)(void *param, const cec_log_message &);
+typedef int (CEC_CDECL* CBCecKeyPressType)(void *param, const cec_keypress &);
+typedef int (CEC_CDECL* CBCecCommandType)(void *param, const cec_command &);
+typedef int (CEC_CDECL* CBCecConfigurationChangedType)(void *param, const libcec_configuration &);
+typedef int (CEC_CDECL* CBCecAlertType)(void *param, const libcec_alert, const libcec_parameter &);
 typedef int (CEC_CDECL* CBCecMenuStateChangedType)(void *param, const cec_menu_state);
 typedef void (CEC_CDECL* CBCecSourceActivatedType)(void *param, const cec_logical_address, const uint8_t);
 
@@ -1161,9 +1149,8 @@ typedef struct ICECCallbacks
   CBCecSourceActivatedType CBCecSourceActivated;
 
 #ifdef __cplusplus
-  // @todo re-add in v2.0 (breaks ABI)
-  // ICECCallbacks(void) { Clear(); }
-  //~ICECCallbacks(void) { Clear(); };
+   ICECCallbacks(void) { Clear(); }
+  ~ICECCallbacks(void) { Clear(); };
 
   void Clear(void)
   {
@@ -1255,9 +1242,8 @@ struct libcec_configuration
   cec_adapter_type      adapterType;          /*!< type of the CEC adapter that we're connected to. added in 1.8.2 */
 
 #ifdef __cplusplus
-  // @todo re-add in v2.0 (breaks ABI)
-  // libcec_configuration(void) { Clear(); }
-  //~libcec_configuration(void) { Clear(); }
+   libcec_configuration(void) { Clear(); }
+  ~libcec_configuration(void) { Clear(); }
 
   bool operator==(const libcec_configuration &other) const
   {
@@ -1328,7 +1314,7 @@ struct libcec_configuration
     adapterType =                     ADAPTERTYPE_UNKNOWN;
 
     memset(strDeviceName, 0, 13);
-    deviceTypes.clear();
+    deviceTypes.Clear();
     logicalAddresses.Clear();
     wakeDevices.Clear();
     powerOffDevices.Clear();