X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=include%2Fcectypes.h;h=ddbd79fdef1da68a2638011dacd222ffd1efea1e;hb=7bb4ed43f15a0fa2be17d2c3f580b181ac7430a7;hp=5213b3770ab417c5bb434e24d8d8cd10b24ff459;hpb=2c7804018856ae3cbfc937b7c9b4cf9b00bc0e8d;p=deb_libcec.git diff --git a/include/cectypes.h b/include/cectypes.h index 5213b37..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. @@ -73,11 +73,10 @@ namespace CEC { #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_PING_ADAPTER_TRIES 5 -#define CEC_FW_VERSION_TRIES 5 +#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 @@ -875,7 +874,6 @@ typedef struct cec_logical_addresses #endif } cec_logical_addresses; - 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);