bump to 2.1.4

[deb_libcec.git] / include / cectypes.h

diff --git a/include/cectypes.h b/include/cectypes.h
index 1e2c7dbe2154444d27328a0b5121d99df78d1df4..9f86253801b6a2be14d981f5ab952c8d309eed30 100644 (file)
--- a/include/cectypes.h
+++ b/include/cectypes.h
@@ -825,27 +825,31 @@ typedef enum cec_bus_device_status
 
 typedef enum cec_vendor_id
 {
-  CEC_VENDOR_TOSHIBA   = 0x000039,
-  CEC_VENDOR_SAMSUNG   = 0x0000F0,
-  CEC_VENDOR_DENON     = 0x0005CD,
-  CEC_VENDOR_LOEWE     = 0x000982,
-  CEC_VENDOR_ONKYO     = 0x0009B0,
-  CEC_VENDOR_MEDION    = 0x000CB8,
-  CEC_VENDOR_AKAI      = 0x0020C7,
-  CEC_VENDOR_AOC       = 0x002467,
-  CEC_VENDOR_PANASONIC = 0x008045,
-  CEC_VENDOR_PHILIPS   = 0x00903E,
-  CEC_VENDOR_DAEWOO    = 0x009053,
-  CEC_VENDOR_YAMAHA    = 0x00A0DE,
-  CEC_VENDOR_GRUNDIG   = 0x00D0D5,
-  CEC_VENDOR_PIONEER   = 0x00E036,
-  CEC_VENDOR_LG        = 0x00E091,
-  CEC_VENDOR_SHARP     = 0x08001F,
-  CEC_VENDOR_SONY      = 0x080046,
-  CEC_VENDOR_BROADCOM  = 0x18C086,
-  CEC_VENDOR_VIZIO     = 0x6B746D,
-  CEC_VENDOR_BENQ      = 0x8065E9,
-  CEC_VENDOR_UNKNOWN   = 0
+  CEC_VENDOR_TOSHIBA       = 0x000039,
+  CEC_VENDOR_SAMSUNG       = 0x0000F0,
+  CEC_VENDOR_DENON         = 0x0005CD,
+  CEC_VENDOR_MARANTZ       = 0x000678,
+  CEC_VENDOR_LOEWE         = 0x000982,
+  CEC_VENDOR_ONKYO         = 0x0009B0,
+  CEC_VENDOR_MEDION        = 0x000CB8,
+  CEC_VENDOR_TOSHIBA2      = 0x000CE7,
+  CEC_VENDOR_PULSE_EIGHT   = 0x001582,
+  CEC_VENDOR_AKAI          = 0x0020C7,
+  CEC_VENDOR_AOC           = 0x002467,
+  CEC_VENDOR_PANASONIC     = 0x008045,
+  CEC_VENDOR_PHILIPS       = 0x00903E,
+  CEC_VENDOR_DAEWOO        = 0x009053,
+  CEC_VENDOR_YAMAHA        = 0x00A0DE,
+  CEC_VENDOR_GRUNDIG       = 0x00D0D5,
+  CEC_VENDOR_PIONEER       = 0x00E036,
+  CEC_VENDOR_LG            = 0x00E091,
+  CEC_VENDOR_SHARP         = 0x08001F,
+  CEC_VENDOR_SONY          = 0x080046,
+  CEC_VENDOR_BROADCOM      = 0x18C086,
+  CEC_VENDOR_VIZIO         = 0x6B746D,
+  CEC_VENDOR_BENQ          = 0x8065E9,
+  CEC_VENDOR_HARMAN_KARDON = 0x9C645E,
+  CEC_VENDOR_UNKNOWN       = 0
 } cec_vendor_id;
 
 typedef enum cec_adapter_type
@@ -915,6 +919,16 @@ typedef struct cec_datapacket
     return *this;
   }
 
+  bool operator ==(const struct cec_datapacket& packet) const
+  {
+    if (size != packet.size)
+      return false;
+    for (uint8_t iPtr = 0; iPtr < size; iPtr++)
+      if (packet.data[iPtr] != data[iPtr])
+        return false;
+    return true;
+  }
+
   bool    IsEmpty(void) const             { return size == 0; }   /**< @return True when this packet is empty, false otherwise. */
   bool    IsFull(void) const              { return size == 100; } /**< @return True when this packet is false, false otherwise. */
 
@@ -1406,7 +1420,11 @@ typedef enum cec_client_version
   CEC_CLIENT_VERSION_2_0_4   = 0x2004,
   CEC_CLIENT_VERSION_2_0_5   = 0x2005,
   CEC_CLIENT_VERSION_2_1_0   = 0x2100,
-  CEC_CLIENT_VERSION_CURRENT = 0x2100
+  CEC_CLIENT_VERSION_2_1_1   = 0x2101,
+  CEC_CLIENT_VERSION_2_1_2   = 0x2102,
+  CEC_CLIENT_VERSION_2_1_3   = 0x2103,
+  CEC_CLIENT_VERSION_2_1_4   = 0x2104,
+  CEC_CLIENT_VERSION_CURRENT = 0x2104
 } cec_client_version;
 
 typedef enum cec_server_version
@@ -1435,7 +1453,11 @@ typedef enum cec_server_version
   CEC_SERVER_VERSION_2_0_4   = 0x2004,
   CEC_SERVER_VERSION_2_0_5   = 0x2005,
   CEC_SERVER_VERSION_2_1_0   = 0x2100,
-  CEC_SERVER_VERSION_CURRENT = 0x2100
+  CEC_SERVER_VERSION_2_1_1   = 0x2101,
+  CEC_SERVER_VERSION_2_1_2   = 0x2102,
+  CEC_SERVER_VERSION_2_1_3   = 0x2103,
+  CEC_SERVER_VERSION_2_1_4   = 0x2104,
+  CEC_SERVER_VERSION_CURRENT = 0x2104
 } cec_server_version;
 
 struct libcec_configuration