From a0b1c785c61b4ff57be541f36e7bf524d8b7cb8a Mon Sep 17 00:00:00 2001
From: Joshua Colp <jcolp@digium.com>
Date: Wed, 2 Dec 2009 18:35:47 +0000
Subject: [PATCH] Add an option to Record which enables a mode where any DTMF
 digit will terminate recording.

(closes issue #15436)
Reported by: Vince
Patches:
      app_record.diff uploaded by Vince (license 823)
Tested by: dbrooks


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@232442 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 CHANGES           |  2 ++
 apps/app_record.c | 10 ++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index b2651d8c93..5e3ff81bb2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -103,6 +103,8 @@ Applications
    variable, AVAILCAUSECODE, instead of overwriting the device state in AVAILSTATUS.
  * Added 'd' option to app_followme.  This option disables the "Please hold"
    announcement.
+ * Added 'y' option to app_record. This option enables a mode where any DTMF digit
+   received will terminate recording.
 
 Dialplan Functions
 ------------------
diff --git a/apps/app_record.c b/apps/app_record.c
index ce4181d6a1..14b665d307 100644
--- a/apps/app_record.c
+++ b/apps/app_record.c
@@ -77,7 +77,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 					</option>
 					<option name="k">
 					        <para>Keep recording if channel hangs up.</para>
-					</option>	
+					</option>
+					<option name="y">
+					        <para>Terminate recording if *any* DTMF digit is received.</para>
+					</option>
 				</optionlist>
 			</parameter>
 		</syntax>
@@ -117,6 +120,7 @@ enum {
 	OPTION_IGNORE_TERMINATE = (1 << 5),
 	OPTION_KEEP = (1 << 6),
 	FLAG_HAS_PERCENT = (1 << 7),
+	OPTION_ANY_TERMINATE = (1 << 8),
 };
 
 AST_APP_OPTIONS(app_opts,{
@@ -126,6 +130,7 @@ AST_APP_OPTIONS(app_opts,{
 	AST_APP_OPTION('q', OPTION_QUIET),
 	AST_APP_OPTION('s', OPTION_SKIP),
 	AST_APP_OPTION('t', OPTION_STAR_TERMINATE),
+	AST_APP_OPTION('y', OPTION_ANY_TERMINATE),
 	AST_APP_OPTION('x', OPTION_IGNORE_TERMINATE),
 });
 
@@ -372,7 +377,8 @@ static int record_exec(struct ast_channel *chan, const char *data)
 				break;
 			}
 		} else if ((f->frametype == AST_FRAME_DTMF) &&
-		    (f->subclass.integer == terminator)) {
+			   ((f->subclass.integer == terminator) ||
+			    (ast_test_flag(&flags, OPTION_ANY_TERMINATE)))) {
 			ast_frfree(f);
 			pbx_builtin_setvar_helper(chan, "RECORD_STATUS", "DTMF");
 			break;
-- 
GitLab