Revert "Make cectypes.h compile under C.". This will have to wait and be fixed proper...

[deb_libcec.git] / include / cectypes.h

diff --git a/include/cectypes.h b/include/cectypes.h
index 2f06aeb15c08375695951b8ee17e2fa04b70e19d..9c3ffec8d188a19c1c64d6f66f1fed0e16bef79a 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;
@@ -1088,19 +1089,19 @@ typedef enum libcec_parameter_type
   CEC_PARAMETER_TYPE_UNKOWN
 } libcec_parameter_type;
 
-typedef struct libcec_parameter
+struct libcec_parameter
 {
   libcec_parameter_type paramType; /**< the type of this parameter */
   void*                 paramData; /**< the value of this parameter */
-} libcec_parameter;
+};
 
-typedef struct libcec_configuration libcec_configuration;
+struct 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);
 
@@ -1218,7 +1219,7 @@ typedef enum cec_server_version
   CEC_SERVER_VERSION_1_9_0   = 0x1900
 } cec_server_version;
 
-struct libcec_configuration
+typedef struct libcec_configuration
 {
   uint32_t              clientVersion;        /*!< the version of the client that is connecting */
   char                  strDeviceName[13];    /*!< how to name the device on the CEC bus */
@@ -1344,7 +1345,7 @@ struct libcec_configuration
     callbacks     = NULL;
   }
 #endif
-};
+} libcec_configuration;
 
 #ifdef __cplusplus
 };