X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=include%2Fcectypes.h;h=f2b2f02b3c9c49fc4060474833ef792fdc49a7f7;hb=2c7c8c4bd985a5148d063fe7c797330e199ce2ff;hp=bc661a8d2d7e1840462af64357337a02cb4de8ec;hpb=f8ae32954754d261552c2c11a6a9055f02d61bba;p=deb_libcec.git

diff --git a/include/cectypes.h b/include/cectypes.h
index bc661a8..f2b2f02 100644
--- a/include/cectypes.h
+++ b/include/cectypes.h
@@ -57,15 +57,21 @@ 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
 #define ESCOFFSET                    3
 #define CEC_BUTTON_TIMEOUT           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        2
+#define CEC_LIB_VERSION_MINOR        3
 
 typedef enum cec_abort_reason
 {
@@ -152,7 +158,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
@@ -597,6 +604,8 @@ typedef enum cec_vendor_id
   CEC_VENDOR_PANASONIC = 0x8045,
   CEC_VENDOR_PIONEER   = 0xE036,
   CEC_VENDOR_ONKYO     = 0x09B0,
+  CEC_VENDOR_YAMAHA    = 0xA0DE,
+  CEC_VENDOR_PHILIPS   = 0x903E,
   CEC_VENDOR_UNKNOWN   = 0
 } cec_vendor_id;
 
@@ -606,6 +615,12 @@ typedef struct cec_menu_language
   cec_logical_address device;
 } cec_menu_language;
 
+typedef struct cec_osd_name
+{
+  char                name[14];
+  cec_logical_address device;
+} cec_osd_name;
+
 typedef struct cec_log_message
 {
   char          message[1024];
@@ -700,11 +715,12 @@ typedef struct cec_command
     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 = CEC_DEFAULT_TRANSMIT_TIMEOUT)
   {
     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;
@@ -736,7 +752,7 @@ typedef struct cec_command
     eom              = 0;
     opcode_set       = 0;
     opcode           = CEC_OPCODE_FEATURE_ABORT;
-    transmit_timeout = 1000;
+    transmit_timeout = CEC_DEFAULT_TRANSMIT_TIMEOUT;
     parameters.Clear();
   };
 #endif