X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=include%2Fcectypes.h;h=e6cd0b4e942967783474a23cb2fcec4ffd62f399;hb=aee82ba0b729a4ba6e64912435639cc8be49c200;hp=6f29921b8cfea6e715203250498e565ab5dc2b9a;hpb=f46dc8465450028c44c7cb0c253ab8b06dc1bcf4;p=deb_libcec.git diff --git a/include/cectypes.h b/include/cectypes.h index 6f29921..e6cd0b4 100644 --- a/include/cectypes.h +++ b/include/cectypes.h @@ -58,6 +58,7 @@ namespace CEC { //default physical address 1.0.0.0, HDMI port 1 #define CEC_DEFAULT_PHYSICAL_ADDRESS 0x1000 #define CEC_DEFAULT_HDMI_PORT 1 +#define CEC_DEFAULT_BASE_DEVICE 0 #define MSGSTART 0xFF #define MSGEND 0xFE #define MSGESC 0xFD @@ -153,7 +154,8 @@ typedef enum cec_deck_info CEC_DECK_INFO_SKIP_REVERSE_REWIND = 0x1C, CEC_DECK_INFO_INDEX_SEARCH_FORWARD = 0x1D, CEC_DECK_INFO_INDEX_SEARCH_REVERSE = 0x1E, - CEC_DECK_INFO_OTHER_STATUS = 0x1F + CEC_DECK_INFO_OTHER_STATUS = 0x1F, + CEC_DECK_INFO_OTHER_STATUS_LG = 0x20 } cec_deck_info; typedef enum cec_device_type @@ -599,6 +601,7 @@ typedef enum cec_vendor_id CEC_VENDOR_PIONEER = 0xE036, CEC_VENDOR_ONKYO = 0x09B0, CEC_VENDOR_YAMAHA = 0xA0DE, + CEC_VENDOR_PHILIPS = 0x903E, CEC_VENDOR_UNKNOWN = 0 } cec_vendor_id; @@ -692,6 +695,7 @@ typedef struct cec_command cec_datapacket parameters; int8_t opcode_set; int32_t transmit_timeout; + int8_t retries; #ifdef __cplusplus cec_command &operator =(const struct cec_command &command) @@ -704,15 +708,17 @@ typedef struct cec_command opcode_set = command.opcode_set; transmit_timeout = command.transmit_timeout; parameters = command.parameters; + retries = command.retries; return *this; } - static void Format(cec_command &command, cec_logical_address initiator, cec_logical_address destination, cec_opcode opcode) + static void Format(cec_command &command, cec_logical_address initiator, cec_logical_address destination, cec_opcode opcode, int32_t timeout = 1000) { command.Clear(); - command.initiator = initiator; - command.destination = destination; + command.initiator = initiator; + command.destination = destination; + command.transmit_timeout = timeout; if (opcode != CEC_OPCODE_NONE) { command.opcode = opcode; @@ -744,7 +750,8 @@ typedef struct cec_command eom = 0; opcode_set = 0; opcode = CEC_OPCODE_FEATURE_ABORT; - transmit_timeout = 1000; + transmit_timeout = 0; + retries = 4; parameters.Clear(); }; #endif