From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Fri, 20 Apr 2012 12:02:59 +0000 (+0200)
Subject: cec: changed the name of the new menu state callback to match the formatting of the... 
X-Git-Tag: upstream/2.2.0~1^2~29^2^2~74
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=c3ce6b477f21ac72bebd036074bfad3b966f6154;p=deb_libcec.git

cec: changed the name of the new menu state callback to match the formatting of the other callbacks. bugzid: 724
---

diff --git a/include/cectypes.h b/include/cectypes.h
index 296e267..8bfd0fa 100644
--- a/include/cectypes.h
+++ b/include/cectypes.h
@@ -1038,7 +1038,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 +1079,14 @@ 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',
    * so keypresses are always routed.
    * @param newVal The new value.
-   * @return 1 when this change should be pr
+   * @return 1 when this change should be processed by the CCECBusDevice, false otherwise.
    */
-  CBCecMenuStatusChangedType CBMenuStatusChanged;
+  CBCecMenuStateChangedType CBCecMenuStateChanged;
 
 #ifdef __cplusplus
    ICECCallbacks(void) { Clear(); }
@@ -1099,7 +1099,7 @@ typedef struct ICECCallbacks
     CBCecCommand              = NULL;
     CBCecConfigurationChanged = NULL;
     CBCecAlert                = NULL;
-    CBMenuStatusChanged       = NULL;
+    CBCecMenuStateChanged     = NULL;
   }
 #endif
 } ICECCallbacks;
diff --git a/src/lib/LibCEC.cpp b/src/lib/LibCEC.cpp
index 9b200a6..8c0aca8 100644
--- a/src/lib/LibCEC.cpp
+++ b/src/lib/LibCEC.cpp
@@ -472,8 +472,8 @@ int CLibCEC::MenuStateChanged(const cec_menu_state newState)
 
   if (instance->m_callbacks &&
       config.clientVersion >= CEC_CLIENT_VERSION_1_6_2 &&
-      instance->m_callbacks->CBMenuStatusChanged)
-    iReturn = instance->m_callbacks->CBMenuStatusChanged(instance->m_cbParam, newState);
+      instance->m_callbacks->CBCecMenuStateChanged)
+    iReturn = instance->m_callbacks->CBCecMenuStateChanged(instance->m_cbParam, newState);
 
   return iReturn;
 }