display an alert message when another device uses the same physical address as libCEC...

[deb_libcec.git] / include / cectypes.h

diff --git a/include/cectypes.h b/include/cectypes.h
index 526a5d85c5896c58b12c4bff2f84e5497def3a16..dfcebfe282e10701b2a526db0fcec576cab15ea4 100644 (file)
--- a/include/cectypes.h
+++ b/include/cectypes.h
@@ -82,7 +82,7 @@ namespace CEC {
 /*!
  * don't send the same key twice within this timeout in milliseconds
  */
-#define CEC_DOUBLE_TAP_TIMEOUT_MS    200
+#define CEC_DOUBLE_TAP_TIMEOUT_MS    250
 
 /*!
  * don't query the power state for the same device within this timeout in milliseconds
@@ -257,7 +257,7 @@ namespace CEC {
 /*!
  * wait this amount of milliseconds before retrying when libCEC failed to make itself the active source
  */
-#define CEC_ACTIVE_SOURCE_SWITCH_RETRY_TIME_MS 5000
+#define CEC_ACTIVE_SOURCE_SWITCH_RETRY_TIME_MS 1000
 
 /*!
  * don't forward any power off command to the client application for this amount of milliseconds after sending a power off command
@@ -274,6 +274,16 @@ namespace CEC {
  */
 #define CEC_RPI_VIRTUAL_COM            "RPI"
 
+/*!
+ * the path to use for the TDA995x's CEC wire
+ */
+#define CEC_TDA995x_PATH               "/dev/hdmicec"
+
+/*!
+ * the name of the virtual COM port to use for the TDA995x's CEC wire
+ */
+#define CEC_TDA995x_VIRTUAL_COM                "CuBox"
+
 /*!
  * Mimimum client version
  */
@@ -299,6 +309,7 @@ namespace CEC {
 #define MSGESC                       0xFD
 #define ESCOFFSET                    3
 
+
 typedef enum cec_abort_reason
 {
   CEC_ABORT_REASON_UNRECOGNIZED_OPCODE            = 0,//!< CEC_ABORT_REASON_UNRECOGNIZED_OPCODE
@@ -830,7 +841,8 @@ typedef enum cec_adapter_type
   ADAPTERTYPE_UNKNOWN          = 0,
   ADAPTERTYPE_P8_EXTERNAL      = 0x1,
   ADAPTERTYPE_P8_DAUGHTERBOARD = 0x2,
-  ADAPTERTYPE_RPI              = 0x100
+  ADAPTERTYPE_RPI              = 0x100,
+  ADAPTERTYPE_TDA995x          = 0x200
 } cec_adapter_type;
 
 typedef struct cec_menu_language
@@ -1244,7 +1256,8 @@ typedef enum libcec_alert
   CEC_ALERT_SERVICE_DEVICE,
   CEC_ALERT_CONNECTION_LOST,
   CEC_ALERT_PERMISSION_ERROR,
-  CEC_ALERT_PORT_BUSY
+  CEC_ALERT_PORT_BUSY,
+  CEC_ALERT_PHYSICAL_ADDRESS_ERROR
 } libcec_alert;
 
 typedef enum libcec_parameter_type
@@ -1362,6 +1375,11 @@ typedef enum cec_client_version
   CEC_CLIENT_VERSION_1_9_0   = 0x1900,
   CEC_CLIENT_VERSION_1_99_0  = 0x1990,
   CEC_CLIENT_VERSION_2_0_0   = 0x2000,
+  CEC_CLIENT_VERSION_2_0_1   = 0x2001,
+  CEC_CLIENT_VERSION_2_0_2   = 0x2002,
+  CEC_CLIENT_VERSION_2_0_3   = 0x2003,
+  CEC_CLIENT_VERSION_2_0_4   = 0x2004,
+  CEC_CLIENT_VERSION_CURRENT = 0x2004
 } cec_client_version;
 
 typedef enum cec_server_version
@@ -1384,6 +1402,11 @@ typedef enum cec_server_version
   CEC_SERVER_VERSION_1_9_0   = 0x1900,
   CEC_SERVER_VERSION_1_99_0  = 0x1990,
   CEC_SERVER_VERSION_2_0_0   = 0x2000,
+  CEC_SERVER_VERSION_2_0_1   = 0x2001,
+  CEC_SERVER_VERSION_2_0_2   = 0x2002,
+  CEC_SERVER_VERSION_2_0_3   = 0x2003,
+  CEC_SERVER_VERSION_2_0_4   = 0x2004,
+  CEC_SERVER_VERSION_CURRENT = 0x2004
 } cec_server_version;
 
 struct libcec_configuration
@@ -1421,6 +1444,7 @@ struct libcec_configuration
   uint8_t               bMonitorOnly;         /*!< won't allocate a CCECClient when starting the connection when set (same as monitor mode). added in 1.6.3 */
   cec_version           cecVersion;           /*!< CEC spec version to use by libCEC. defaults to v1.4. added in 1.8.0 */
   cec_adapter_type      adapterType;          /*!< type of the CEC adapter that we're connected to. added in 1.8.2 */
+  uint8_t               iDoubleTapTimeoutMs;  /*!< prevent double taps withing this timeout. defaults to 200ms. added in 2.0.0 */
 
 #ifdef __cplusplus
    libcec_configuration(void) { Clear(); }
@@ -1453,7 +1477,8 @@ struct libcec_configuration
                   iFirmwareBuildDate        == other.iFirmwareBuildDate &&
                   bMonitorOnly              == other.bMonitorOnly &&
                   cecVersion                == other.cecVersion &&
-                  adapterType               == other.adapterType);
+                  adapterType               == other.adapterType &&
+                  iDoubleTapTimeoutMs       == other.iDoubleTapTimeoutMs);
   }
 
   bool operator!=(const libcec_configuration &other) const
@@ -1487,6 +1512,7 @@ struct libcec_configuration
     bMonitorOnly =                    0;
     cecVersion =         (cec_version)CEC_DEFAULT_SETTING_CEC_VERSION;
     adapterType =                     ADAPTERTYPE_UNKNOWN;
+    iDoubleTapTimeoutMs =             CEC_DOUBLE_TAP_TIMEOUT_MS;
 
     memset(strDeviceName, 0, 13);
     deviceTypes.Clear();