<p>George Joseph <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/15479">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Joshua Colp: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved; Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">app_mixmonitor: Add AMI events MixMonitorStart, -Stop and -Mute.<br><br>ASTERISK-29244<br><br>Change-Id: I1862d58264c2c8b5d8983272cb29734b184d67c5<br>---<br>M apps/app_mixmonitor.c<br>M configs/samples/stasis.conf.sample<br>A doc/CHANGES-staging/mixmonitor_manager_events.txt<br>M include/asterisk/stasis_channels.h<br>M main/manager_channels.c<br>M main/stasis.c<br>M main/stasis_channels.c<br>7 files changed, 175 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c</span><br><span>index 239901f..374c567 100644</span><br><span>--- a/apps/app_mixmonitor.c</span><br><span>+++ b/apps/app_mixmonitor.c</span><br><span>@@ -51,6 +51,8 @@</span><br><span> #include "asterisk/channel.h"</span><br><span> #include "asterisk/autochan.h"</span><br><span> #include "asterisk/manager.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "asterisk/stasis.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "asterisk/stasis_channels.h"</span><br><span> #include "asterisk/callerid.h"</span><br><span> #include "asterisk/mod_format.h"</span><br><span> #include "asterisk/linkedlists.h"</span><br><span>@@ -295,6 +297,51 @@</span><br><span>                  </parameter></span><br><span>           </syntax></span><br><span>      </function></span><br><span style="color: hsl(120, 100%, 40%);">+     <managerEvent language="en_US" name="MixMonitorStart"></span><br><span style="color: hsl(120, 100%, 40%);">+              <managerEventInstance class="EVENT_FLAG_CALL"></span><br><span style="color: hsl(120, 100%, 40%);">+                        <synopsis>Raised when monitoring has started on a channel.</synopsis></span><br><span style="color: hsl(120, 100%, 40%);">+                     <syntax></span><br><span style="color: hsl(120, 100%, 40%);">+                                <channel_snapshot/></span><br><span style="color: hsl(120, 100%, 40%);">+                     </syntax></span><br><span style="color: hsl(120, 100%, 40%);">+                       <see-also></span><br><span style="color: hsl(120, 100%, 40%);">+                              <ref type="managerEvent">MixMonitorStop</ref></span><br><span style="color: hsl(120, 100%, 40%);">+                           <ref type="application">MixMonitor</ref></span><br><span style="color: hsl(120, 100%, 40%);">+                                <ref type="manager">MixMonitor</ref></span><br><span style="color: hsl(120, 100%, 40%);">+                    </see-also></span><br><span style="color: hsl(120, 100%, 40%);">+             </managerEventInstance></span><br><span style="color: hsl(120, 100%, 40%);">+ </managerEvent></span><br><span style="color: hsl(120, 100%, 40%);">+ <managerEvent language="en_US" name="MixMonitorStop"></span><br><span style="color: hsl(120, 100%, 40%);">+               <managerEventInstance class="EVENT_FLAG_CALL"></span><br><span style="color: hsl(120, 100%, 40%);">+                <synopsis>Raised when monitoring has stopped on a channel.</synopsis></span><br><span style="color: hsl(120, 100%, 40%);">+             <syntax></span><br><span style="color: hsl(120, 100%, 40%);">+                        <channel_snapshot/></span><br><span style="color: hsl(120, 100%, 40%);">+             </syntax></span><br><span style="color: hsl(120, 100%, 40%);">+               <see-also></span><br><span style="color: hsl(120, 100%, 40%);">+                      <ref type="managerEvent">MixMonitorStart</ref></span><br><span style="color: hsl(120, 100%, 40%);">+                  <ref type="application">StopMixMonitor</ref></span><br><span style="color: hsl(120, 100%, 40%);">+                    <ref type="manager">StopMixMonitor</ref></span><br><span style="color: hsl(120, 100%, 40%);">+                </see-also></span><br><span style="color: hsl(120, 100%, 40%);">+             </managerEventInstance></span><br><span style="color: hsl(120, 100%, 40%);">+ </managerEvent></span><br><span style="color: hsl(120, 100%, 40%);">+ <managerEvent language="en_US" name="MixMonitorMute"></span><br><span style="color: hsl(120, 100%, 40%);">+               <managerEventInstance class="EVENT_FLAG_CALL"></span><br><span style="color: hsl(120, 100%, 40%);">+                <synopsis>Raised when monitoring is muted or unmuted on a channel.</synopsis></span><br><span style="color: hsl(120, 100%, 40%);">+             <syntax></span><br><span style="color: hsl(120, 100%, 40%);">+                        <channel_snapshot/></span><br><span style="color: hsl(120, 100%, 40%);">+                     <parameter name="Direction"></span><br><span style="color: hsl(120, 100%, 40%);">+                          <para>Which part of the recording was muted or unmuted: read, write or both</span><br><span style="color: hsl(120, 100%, 40%);">+                             (from channel, to channel or both directions).</para></span><br><span style="color: hsl(120, 100%, 40%);">+                   </parameter></span><br><span style="color: hsl(120, 100%, 40%);">+                    <parameter name="State"></span><br><span style="color: hsl(120, 100%, 40%);">+                              <para>If the monitoring was muted or unmuted: 1 when muted, 0 when unmuted.</para></span><br><span style="color: hsl(120, 100%, 40%);">+                        </parameter></span><br><span style="color: hsl(120, 100%, 40%);">+            </syntax></span><br><span style="color: hsl(120, 100%, 40%);">+               <see-also></span><br><span style="color: hsl(120, 100%, 40%);">+                      <ref type="manager">MixMonitorMute</ref></span><br><span style="color: hsl(120, 100%, 40%);">+                </see-also></span><br><span style="color: hsl(120, 100%, 40%);">+             </managerEventInstance></span><br><span style="color: hsl(120, 100%, 40%);">+ </managerEvent></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span>  ***/</span><br><span> </span><br><span>@@ -1077,6 +1124,7 @@</span><br><span>     struct ast_flags flags = { 0 };</span><br><span>      char *recipients = NULL;</span><br><span>     char *parse;</span><br><span style="color: hsl(120, 100%, 40%);">+  RAII_VAR(struct stasis_message *, message, NULL, ao2_cleanup);</span><br><span>       AST_DECLARE_APP_ARGS(args,</span><br><span>           AST_APP_ARG(filename);</span><br><span>               AST_APP_ARG(options);</span><br><span>@@ -1197,6 +1245,12 @@</span><br><span>               ast_module_unref(ast_module_info->self);</span><br><span>  }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ message = ast_channel_blob_create_from_cache(ast_channel_uniqueid(chan),</span><br><span style="color: hsl(120, 100%, 40%);">+              ast_channel_mixmonitor_start_type(), NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+   if (message) {</span><br><span style="color: hsl(120, 100%, 40%);">+                stasis_publish(ast_channel_topic(chan), message);</span><br><span style="color: hsl(120, 100%, 40%);">+     }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>  return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -1206,6 +1260,7 @@</span><br><span>   char *parse = "";</span><br><span>  struct mixmonitor_ds *mixmonitor_ds;</span><br><span>         const char *beep_id = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+   RAII_VAR(struct stasis_message *, message, NULL, ao2_cleanup);</span><br><span> </span><br><span>   AST_DECLARE_APP_ARGS(args,</span><br><span>           AST_APP_ARG(mixmonid);</span><br><span>@@ -1263,6 +1318,13 @@</span><br><span>              ast_beep_stop(chan, beep_id);</span><br><span>        }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ message = ast_channel_blob_create_from_cache(ast_channel_uniqueid(chan),</span><br><span style="color: hsl(120, 100%, 40%);">+                                                   ast_channel_mixmonitor_stop_type(),</span><br><span style="color: hsl(120, 100%, 40%);">+                                                   NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+   if (message) {</span><br><span style="color: hsl(120, 100%, 40%);">+                stasis_publish(ast_channel_topic(chan), message);</span><br><span style="color: hsl(120, 100%, 40%);">+     }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>  return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -1350,6 +1412,8 @@</span><br><span>   const char *direction = astman_get_header(m,"Direction");</span><br><span>  int clearmute = 1;</span><br><span>   enum ast_audiohook_flags flag;</span><br><span style="color: hsl(120, 100%, 40%);">+        RAII_VAR(struct stasis_message *, stasis_message, NULL, ao2_cleanup);</span><br><span style="color: hsl(120, 100%, 40%);">+ RAII_VAR(struct ast_json *, stasis_message_blob, NULL, ast_json_unref);</span><br><span> </span><br><span>  if (ast_strlen_zero(direction)) {</span><br><span>            astman_send_error(s, m, "No direction specified. Must be read, write or both");</span><br><span>@@ -1391,6 +1455,17 @@</span><br><span>           return AMI_SUCCESS;</span><br><span>  }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ stasis_message_blob = ast_json_pack("{s: s, s: b}",</span><br><span style="color: hsl(120, 100%, 40%);">+         "direction", direction,</span><br><span style="color: hsl(120, 100%, 40%);">+             "state", ast_true(state));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+        stasis_message = ast_channel_blob_create_from_cache(ast_channel_uniqueid(c),</span><br><span style="color: hsl(120, 100%, 40%);">+          ast_channel_mixmonitor_mute_type(), stasis_message_blob);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   if (stasis_message) {</span><br><span style="color: hsl(120, 100%, 40%);">+         stasis_publish(ast_channel_topic(c), stasis_message);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>  astman_append(s, "Response: Success\r\n");</span><br><span> </span><br><span>     if (!ast_strlen_zero(id)) {</span><br><span>diff --git a/configs/samples/stasis.conf.sample b/configs/samples/stasis.conf.sample</span><br><span>index e591e76..46a240e 100644</span><br><span>--- a/configs/samples/stasis.conf.sample</span><br><span>+++ b/configs/samples/stasis.conf.sample</span><br><span>@@ -63,6 +63,8 @@</span><br><span> ; decline=ast_channel_moh_stop_type</span><br><span> ; decline=ast_channel_monitor_start_type</span><br><span> ; decline=ast_channel_monitor_stop_type</span><br><span style="color: hsl(120, 100%, 40%);">+; decline=ast_channel_mixmonitor_start_type</span><br><span style="color: hsl(120, 100%, 40%);">+; decline=ast_channel_mixmonitor_stop_type</span><br><span> ; decline=ast_channel_agent_login_type</span><br><span> ; decline=ast_channel_agent_logoff_type</span><br><span> ; decline=ast_channel_talking_start</span><br><span>diff --git a/doc/CHANGES-staging/mixmonitor_manager_events.txt b/doc/CHANGES-staging/mixmonitor_manager_events.txt</span><br><span>new file mode 100644</span><br><span>index 0000000..64b63e5</span><br><span>--- /dev/null</span><br><span>+++ b/doc/CHANGES-staging/mixmonitor_manager_events.txt</span><br><span>@@ -0,0 +1,5 @@</span><br><span style="color: hsl(120, 100%, 40%);">+Subject: app_mixmonitor</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+app_mixmonitor now sends manager events MixMonitorStart, MixMonitorStop and</span><br><span style="color: hsl(120, 100%, 40%);">+MixMonitorMute when the channel monitoring is started, stopped and muted (or</span><br><span style="color: hsl(120, 100%, 40%);">+unmuted) respectively.</span><br><span>diff --git a/include/asterisk/stasis_channels.h b/include/asterisk/stasis_channels.h</span><br><span>index 9c47984..02654e9 100644</span><br><span>--- a/include/asterisk/stasis_channels.h</span><br><span>+++ b/include/asterisk/stasis_channels.h</span><br><span>@@ -590,7 +590,31 @@</span><br><span> struct stasis_message_type *ast_channel_monitor_stop_type(void);</span><br><span> </span><br><span> /*!</span><br><span style="color: hsl(0, 100%, 40%);">- * \since 12.0.0</span><br><span style="color: hsl(120, 100%, 40%);">+ * \since 18</span><br><span style="color: hsl(120, 100%, 40%);">+ * \brief Message type for starting mixmonitor on a channel</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * \retval A stasis message type</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+struct stasis_message_type *ast_channel_mixmonitor_start_type(void);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*!</span><br><span style="color: hsl(120, 100%, 40%);">+ * \since 18</span><br><span style="color: hsl(120, 100%, 40%);">+ * \brief Message type for stopping mixmonitor on a channel</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * \retval A stasis message type</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+struct stasis_message_type *ast_channel_mixmonitor_stop_type(void);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*!</span><br><span style="color: hsl(120, 100%, 40%);">+ * \since 18</span><br><span style="color: hsl(120, 100%, 40%);">+ * \brief Message type for muting or unmuting mixmonitor on a channel</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * \retval A stasis message type</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+struct stasis_message_type *ast_channel_mixmonitor_mute_type(void);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*!</span><br><span style="color: hsl(120, 100%, 40%);">+ * \since 18.0.0</span><br><span>  * \brief Message type for agent login on a channel</span><br><span>  *</span><br><span>  * \retval A stasis message type</span><br><span>diff --git a/main/manager_channels.c b/main/manager_channels.c</span><br><span>index 73b76c8..7f40efe 100644</span><br><span>--- a/main/manager_channels.c</span><br><span>+++ b/main/manager_channels.c</span><br><span>@@ -1116,6 +1116,53 @@</span><br><span>      publish_basic_channel_event("MonitorStop", EVENT_FLAG_CALL, payload->snapshot);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void channel_mixmonitor_start_cb(void *data, struct stasis_subscription *sub,</span><br><span style="color: hsl(120, 100%, 40%);">+           struct stasis_message *message)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+    struct ast_channel_blob *payload = stasis_message_data(message);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+    publish_basic_channel_event("MixMonitorStart", EVENT_FLAG_CALL, payload->snapshot);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void channel_mixmonitor_stop_cb(void *data, struct stasis_subscription *sub,</span><br><span style="color: hsl(120, 100%, 40%);">+            struct stasis_message *message)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+    struct ast_channel_blob *payload = stasis_message_data(message);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+    publish_basic_channel_event("MixMonitorStop", EVENT_FLAG_CALL, payload->snapshot);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void channel_mixmonitor_mute_cb(void *data, struct stasis_subscription *sub,</span><br><span style="color: hsl(120, 100%, 40%);">+             struct stasis_message *message)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+    RAII_VAR(struct ast_str *, channel_event_string, NULL, ast_free);</span><br><span style="color: hsl(120, 100%, 40%);">+     RAII_VAR(struct ast_str *, event_buffer, ast_str_create(64), ast_free);</span><br><span style="color: hsl(120, 100%, 40%);">+       struct ast_channel_blob *payload = stasis_message_data(message);</span><br><span style="color: hsl(120, 100%, 40%);">+      struct ast_json *direction = ast_json_object_get(payload->blob, "direction");</span><br><span style="color: hsl(120, 100%, 40%);">+    const int state = ast_json_is_true(ast_json_object_get(payload->blob, "state"));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+       if (!event_buffer) {</span><br><span style="color: hsl(120, 100%, 40%);">+          return;</span><br><span style="color: hsl(120, 100%, 40%);">+       }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   channel_event_string = ast_manager_build_channel_state_string(payload->snapshot);</span><br><span style="color: hsl(120, 100%, 40%);">+  if (!channel_event_string) {</span><br><span style="color: hsl(120, 100%, 40%);">+          return;</span><br><span style="color: hsl(120, 100%, 40%);">+       }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   if (direction) {</span><br><span style="color: hsl(120, 100%, 40%);">+              ast_str_append(&event_buffer, 0, "Direction: %s\r\n", ast_json_string_get(direction));</span><br><span style="color: hsl(120, 100%, 40%);">+  }</span><br><span style="color: hsl(120, 100%, 40%);">+     ast_str_append(&event_buffer, 0, "State: %s\r\n", state ? "1" : "0");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+     manager_event(EVENT_FLAG_CALL, "MixMonitorMute",</span><br><span style="color: hsl(120, 100%, 40%);">+            "%s"</span><br><span style="color: hsl(120, 100%, 40%);">+                "%s",</span><br><span style="color: hsl(120, 100%, 40%);">+               ast_str_buffer(channel_event_string),</span><br><span style="color: hsl(120, 100%, 40%);">+         ast_str_buffer(event_buffer));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static int dial_status_end(const char *dialstatus)</span><br><span> {</span><br><span>     return (strcmp(dialstatus, "RINGING") &&</span><br><span>@@ -1320,6 +1367,15 @@</span><br><span>  ret |= stasis_message_router_add(message_router,</span><br><span>             ast_channel_monitor_stop_type(), channel_monitor_stop_cb, NULL);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+  ret |= stasis_message_router_add(message_router,</span><br><span style="color: hsl(120, 100%, 40%);">+              ast_channel_mixmonitor_start_type(), channel_mixmonitor_start_cb, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+    ret |= stasis_message_router_add(message_router,</span><br><span style="color: hsl(120, 100%, 40%);">+              ast_channel_mixmonitor_stop_type(), channel_mixmonitor_stop_cb, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+      ret |= stasis_message_router_add(message_router,</span><br><span style="color: hsl(120, 100%, 40%);">+              ast_channel_mixmonitor_mute_type(), channel_mixmonitor_mute_cb, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>     /* If somehow we failed to add any routes, just shut down the whole</span><br><span>   * thing and fail it.</span><br><span>         */</span><br><span>diff --git a/main/stasis.c b/main/stasis.c</span><br><span>index 44d5973..4ae6d6a 100644</span><br><span>--- a/main/stasis.c</span><br><span>+++ b/main/stasis.c</span><br><span>@@ -130,6 +130,9 @@</span><br><span>                                                   <enum name="ast_channel_moh_stop_type" /></span><br><span>                                                    <enum name="ast_channel_monitor_start_type" /></span><br><span>                                                       <enum name="ast_channel_monitor_stop_type" /></span><br><span style="color: hsl(120, 100%, 40%);">+                                                 <enum name="ast_channel_mixmonitor_start_type" /></span><br><span style="color: hsl(120, 100%, 40%);">+                                                     <enum name="ast_channel_mixmonitor_stop_type" /></span><br><span style="color: hsl(120, 100%, 40%);">+                                                      <enum name="ast_channel_mixmonitor_mute_type" /></span><br><span>                                                     <enum name="ast_channel_agent_login_type" /></span><br><span>                                                         <enum name="ast_channel_agent_logoff_type" /></span><br><span>                                                        <enum name="ast_channel_talking_start" /></span><br><span>diff --git a/main/stasis_channels.c b/main/stasis_channels.c</span><br><span>index 3d213c7..3f3312b 100644</span><br><span>--- a/main/stasis_channels.c</span><br><span>+++ b/main/stasis_channels.c</span><br><span>@@ -1606,6 +1606,9 @@</span><br><span> STASIS_MESSAGE_TYPE_DEFN(ast_channel_moh_stop_type);</span><br><span> STASIS_MESSAGE_TYPE_DEFN(ast_channel_monitor_start_type);</span><br><span> STASIS_MESSAGE_TYPE_DEFN(ast_channel_monitor_stop_type);</span><br><span style="color: hsl(120, 100%, 40%);">+STASIS_MESSAGE_TYPE_DEFN(ast_channel_mixmonitor_start_type);</span><br><span style="color: hsl(120, 100%, 40%);">+STASIS_MESSAGE_TYPE_DEFN(ast_channel_mixmonitor_stop_type);</span><br><span style="color: hsl(120, 100%, 40%);">+STASIS_MESSAGE_TYPE_DEFN(ast_channel_mixmonitor_mute_type);</span><br><span> STASIS_MESSAGE_TYPE_DEFN(ast_channel_agent_login_type,</span><br><span>    .to_ami = agent_login_to_ami,</span><br><span>        );</span><br><span>@@ -1649,6 +1652,9 @@</span><br><span>   STASIS_MESSAGE_TYPE_CLEANUP(ast_channel_moh_stop_type);</span><br><span>      STASIS_MESSAGE_TYPE_CLEANUP(ast_channel_monitor_start_type);</span><br><span>         STASIS_MESSAGE_TYPE_CLEANUP(ast_channel_monitor_stop_type);</span><br><span style="color: hsl(120, 100%, 40%);">+   STASIS_MESSAGE_TYPE_CLEANUP(ast_channel_mixmonitor_start_type);</span><br><span style="color: hsl(120, 100%, 40%);">+       STASIS_MESSAGE_TYPE_CLEANUP(ast_channel_mixmonitor_stop_type);</span><br><span style="color: hsl(120, 100%, 40%);">+        STASIS_MESSAGE_TYPE_CLEANUP(ast_channel_mixmonitor_mute_type);</span><br><span>       STASIS_MESSAGE_TYPE_CLEANUP(ast_channel_agent_login_type);</span><br><span>   STASIS_MESSAGE_TYPE_CLEANUP(ast_channel_agent_logoff_type);</span><br><span>  STASIS_MESSAGE_TYPE_CLEANUP(ast_channel_talking_start);</span><br><span>@@ -1699,6 +1705,9 @@</span><br><span>      res |= STASIS_MESSAGE_TYPE_INIT(ast_channel_moh_stop_type);</span><br><span>  res |= STASIS_MESSAGE_TYPE_INIT(ast_channel_monitor_start_type);</span><br><span>     res |= STASIS_MESSAGE_TYPE_INIT(ast_channel_monitor_stop_type);</span><br><span style="color: hsl(120, 100%, 40%);">+       res |= STASIS_MESSAGE_TYPE_INIT(ast_channel_mixmonitor_start_type);</span><br><span style="color: hsl(120, 100%, 40%);">+   res |= STASIS_MESSAGE_TYPE_INIT(ast_channel_mixmonitor_stop_type);</span><br><span style="color: hsl(120, 100%, 40%);">+    res |= STASIS_MESSAGE_TYPE_INIT(ast_channel_mixmonitor_mute_type);</span><br><span>   res |= STASIS_MESSAGE_TYPE_INIT(ast_channel_talking_start);</span><br><span>  res |= STASIS_MESSAGE_TYPE_INIT(ast_channel_talking_stop);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/15479">change 15479</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/15479"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 18 </div>
<div style="display:none"> Gerrit-Change-Id: I1862d58264c2c8b5d8983272cb29734b184d67c5 </div>
<div style="display:none"> Gerrit-Change-Number: 15479 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Sébastien Duthil <sduthil@wazo.community> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@sangoma.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>