X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=include%2Fcectypes.h;h=ddbd79fdef1da68a2638011dacd222ffd1efea1e;hb=7bb4ed43f15a0fa2be17d2c3f580b181ac7430a7;hp=46b25e483324bc6b5b9c536063377915693f539d;hpb=761ccce0c3c48da744dfa01f62097ebf54d01f52;p=deb_libcec.git

diff --git a/include/cectypes.h b/include/cectypes.h
index 46b25e4..ddbd79f 100644
--- a/include/cectypes.h
+++ b/include/cectypes.h
@@ -2,7 +2,7 @@
 /*
  * This file is part of the libCEC(R) library.
  *
- * libCEC(R) is Copyright (C) 2011 Pulse-Eight Limited.  All rights reserved.
+ * libCEC(R) is Copyright (C) 2011-2012 Pulse-Eight Limited.  All rights reserved.
  * libCEC(R) is an original work, containing original code.
  *
  * libCEC(R) is a trademark of Pulse-Eight Limited.
@@ -38,15 +38,14 @@
 #include <string.h>
 
 #if defined(_WIN32) || defined(_WIN64)
-#define CDECL    __cdecl
+#define CEC_CDECL    __cdecl
 #else
-#define CDECL
+#define CEC_CDECL
 #endif
 
 #if !defined(DECLSPEC)
 #if defined(_WIN32) || defined(_WIN64)
 #include <windows.h>
-#define CDECL    __cdecl
 #if defined DLL_EXPORT
 #define DECLSPEC __declspec(dllexport)
 #else
@@ -72,14 +71,16 @@ namespace CEC {
 #define ESCOFFSET                    3
 #define CEC_BUTTON_TIMEOUT           500
 #define CEC_POWER_STATE_REFRESH_TIME 30000
+#define CEC_FW_VERSION_UNKNOWN       0xFFFF
 
-#define CEC_DEFAULT_TRANSMIT_TIMEOUT 1000
-#define CEC_DEFAULT_TRANSMIT_WAIT    2000
-#define CEC_DEFAULT_TRANSMIT_RETRIES 1
+#define CEC_DEFAULT_TRANSMIT_RETRY_WAIT 500
+#define CEC_DEFAULT_TRANSMIT_TIMEOUT    1000
+#define CEC_DEFAULT_TRANSMIT_WAIT       2000
+#define CEC_DEFAULT_TRANSMIT_RETRIES    1
 
 #define CEC_MIN_LIB_VERSION          1
 #define CEC_LIB_VERSION_MAJOR        1
-#define CEC_LIB_VERSION_MINOR        3
+#define CEC_LIB_VERSION_MINOR        4
 
 typedef enum cec_abort_reason
 {
@@ -873,10 +874,9 @@ typedef struct cec_logical_addresses
 #endif
 } cec_logical_addresses;
 
-
-typedef int (CDECL* CBCecLogMessageType)(const CEC::cec_log_message &);
-typedef int (CDECL* CBCecKeyPressType)(const cec_keypress &key);
-typedef int (CDECL* CBCecCommandType)(const cec_command &command);
+typedef int (CEC_CDECL* CBCecLogMessageType)(void *param, const CEC::cec_log_message &);
+typedef int (CEC_CDECL* CBCecKeyPressType)(void *param, const cec_keypress &key);
+typedef int (CEC_CDECL* CBCecCommandType)(void *param, const cec_command &command);
 
 typedef struct ICECCallbacks
 {