X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=include%2Fcectypes.h;h=c1cc1af89c2b9989af09e5878eb228d419a320da;hb=6ad51ff559b2fc75ce63bc35832932f00c20b925;hp=296e267fb7a410f9c01d54febfadbc7dd455997a;hpb=e1804a4e359f5e188a02705c85e7e666d1d1482e;p=deb_libcec.git

diff --git a/include/cectypes.h b/include/cectypes.h
index 296e267..c1cc1af 100644
--- a/include/cectypes.h
+++ b/include/cectypes.h
@@ -1017,7 +1017,8 @@ typedef struct cec_logical_addresses
 
 typedef enum libcec_alert
 {
-  CEC_ALERT_SERVICE_DEVICE
+  CEC_ALERT_SERVICE_DEVICE,
+  CEC_ALERT_CONNECTION_LOST
 } libcec_alert;
 
 typedef enum libcec_parameter_type
@@ -1038,7 +1039,7 @@ typedef int (CEC_CDECL* CBCecKeyPressType)(void *param, const cec_keypress &);
 typedef int (CEC_CDECL* CBCecCommandType)(void *param, const cec_command &);
 typedef int (CEC_CDECL* CBCecConfigurationChangedType)(void *param, const libcec_configuration &);
 typedef int (CEC_CDECL* CBCecAlertType)(void *param, const libcec_alert, const libcec_parameter &);
-typedef int (CEC_CDECL* CBCecMenuStatusChangedType)(void *param, const cec_menu_state newVal);
+typedef int (CEC_CDECL* CBCecMenuStateChangedType)(void *param, const cec_menu_state newVal);
 
 typedef struct ICECCallbacks
 {
@@ -1079,14 +1080,15 @@ typedef struct ICECCallbacks
   CBCecAlertType CBCecAlert;
 
   /*!
-   * @brief Transfer a menu status change to the client.
-   * Transfer a menu status change to the client. If the command returns 1, then the change will be processed by
+   * @brief Transfer a menu state change to the client.
+   * Transfer a menu state change to the client. If the command returns 1, then the change will be processed by
    * the busdevice. If 0, then the state of the busdevice won't be changed, and will always be kept 'activated',
+   * @warning CEC does not allow the player to suppress the menu state change on the TV, so the menu on the TV will always be displayed, whatever the return value of this method is.
    * so keypresses are always routed.
    * @param newVal The new value.
-   * @return 1 when this change should be pr
+   * @return 1 when libCEC should use this new value, 0 otherwise.
    */
-  CBCecMenuStatusChangedType CBMenuStatusChanged;
+  CBCecMenuStateChangedType CBCecMenuStateChanged;
 
 #ifdef __cplusplus
    ICECCallbacks(void) { Clear(); }
@@ -1099,7 +1101,7 @@ typedef struct ICECCallbacks
     CBCecCommand              = NULL;
     CBCecConfigurationChanged = NULL;
     CBCecAlert                = NULL;
-    CBMenuStatusChanged       = NULL;
+    CBCecMenuStateChanged     = NULL;
   }
 #endif
 } ICECCallbacks;
@@ -1124,7 +1126,8 @@ typedef enum cec_server_version
   CEC_SERVER_VERSION_1_5_2   = 0x1502,
   CEC_SERVER_VERSION_1_5_3   = 0x1503,
   CEC_SERVER_VERSION_1_6_0   = 0x1600,
-  CEC_SERVER_VERSION_1_6_1   = 0x1601
+  CEC_SERVER_VERSION_1_6_1   = 0x1601,
+  CEC_SERVER_VERSION_1_6_2   = 0x1602
 } cec_server_version;
 
 typedef struct libcec_configuration