<p>Friendly Automation <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/16645">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Joshua Colp: Looks good to me, but someone else must approve
Sean Bright: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved
Friendly Automation: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">res_speech: Add a type conversion, and new engine unregister methods<br><br>Add a new function that converts a speech results type to a string.<br>Also add another function to unregister an engine, but returns a<br>pointer to the unregistered engine object instead of a success/fail<br>integer.<br><br>Change-Id: I0f7de17cb411021c09fb03988bc2b904e1380192<br>---<br>M include/asterisk/speech.h<br>M res/res_speech.c<br>2 files changed, 29 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/asterisk/speech.h b/include/asterisk/speech.h</span><br><span>index 7af7e99..681c536 100644</span><br><span>--- a/include/asterisk/speech.h</span><br><span>+++ b/include/asterisk/speech.h</span><br><span>@@ -47,6 +47,9 @@</span><br><span> AST_SPEECH_RESULTS_TYPE_NBEST,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! \brief Convert a speech results type to a string */</span><br><span style="color: hsl(120, 100%, 40%);">+const char *ast_speech_results_type_to_string(enum ast_speech_results_type type);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Speech structure */</span><br><span> struct ast_speech {</span><br><span> /*! Structure lock */</span><br><span>@@ -152,6 +155,9 @@</span><br><span> int ast_speech_register(struct ast_speech_engine *engine);</span><br><span> /*! \brief Unregister a speech recognition engine */</span><br><span> int ast_speech_unregister(const char *engine_name);</span><br><span style="color: hsl(120, 100%, 40%);">+/*! \brief Unregister a speech recognition engine */</span><br><span style="color: hsl(120, 100%, 40%);">+struct ast_speech_engine *ast_speech_unregister2(const char *engine_name);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> #if defined(__cplusplus) || defined(c_plusplus)</span><br><span> }</span><br><span>diff --git a/res/res_speech.c b/res/res_speech.c</span><br><span>index 57f6fa6..d425fde 100644</span><br><span>--- a/res/res_speech.c</span><br><span>+++ b/res/res_speech.c</span><br><span>@@ -280,6 +280,19 @@</span><br><span> return res;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+const char *ast_speech_results_type_to_string(enum ast_speech_results_type type)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (type) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case AST_SPEECH_RESULTS_TYPE_NORMAL:</span><br><span style="color: hsl(120, 100%, 40%);">+ return "normal";</span><br><span style="color: hsl(120, 100%, 40%);">+ case AST_SPEECH_RESULTS_TYPE_NBEST:</span><br><span style="color: hsl(120, 100%, 40%);">+ return "nbest";</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_assert(0);</span><br><span style="color: hsl(120, 100%, 40%);">+ return "unknown";</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> /*! \brief Change the type of results we want */</span><br><span> int ast_speech_change_results_type(struct ast_speech *speech, enum ast_speech_results_type results_type)</span><br><span> {</span><br><span>@@ -322,11 +335,16 @@</span><br><span> /*! \brief Unregister a speech recognition engine */</span><br><span> int ast_speech_unregister(const char *engine_name)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct ast_speech_engine *engine = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- int res = -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ return ast_speech_unregister2(engine_name) == NULL ? -1 : 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (ast_strlen_zero(engine_name))</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+struct ast_speech_engine *ast_speech_unregister2(const char *engine_name)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ast_speech_engine *engine = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ast_strlen_zero(engine_name)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> AST_RWLIST_WRLOCK(&engines);</span><br><span> AST_RWLIST_TRAVERSE_SAFE_BEGIN(&engines, engine, list) {</span><br><span>@@ -339,14 +357,13 @@</span><br><span> }</span><br><span> ast_verb(2, "Unregistered speech recognition engine '%s'\n", engine_name);</span><br><span> /* All went well */</span><br><span style="color: hsl(0, 100%, 40%);">- res = 0;</span><br><span> break;</span><br><span> }</span><br><span> }</span><br><span> AST_RWLIST_TRAVERSE_SAFE_END;</span><br><span> AST_RWLIST_UNLOCK(&engines);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return res;</span><br><span style="color: hsl(120, 100%, 40%);">+ return engine;</span><br><span> }</span><br><span> </span><br><span> static int unload_module(void)</span><br><span></span><br></pre><div style="white-space:pre-wrap"></div><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/16645">change 16645</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/+/16645"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 16 </div>
<div style="display:none"> Gerrit-Change-Id: I0f7de17cb411021c09fb03988bc2b904e1380192 </div>
<div style="display:none"> Gerrit-Change-Number: 16645 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Kevin Harwell <kharwell@digium.com> </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-Reviewer: Sean Bright <sean@seanbright.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>