From: Anthony Minessale <anthm@freeswitch.org>
Date: Mon, 11 Oct 2010 23:38:30 +0000 (-0500)
Subject: add some more dmachine code for args parsing
X-Git-Tag: v1.2-rc1~291^2~7^2~8^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec9fddacceaf86ebddc32095e458aceb832333db;p=thirdparty%2Ffreeswitch.git

add some more dmachine code for args parsing
---

diff --git a/src/switch_ivr.c b/src/switch_ivr.c
index ef360d3148..744072c145 100644
--- a/src/switch_ivr.c
+++ b/src/switch_ivr.c
@@ -232,7 +232,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_sleep(switch_core_session_t *session,
 			   if you return anything but SWITCH_STATUS_SUCCESS the playback will stop.
 			 */
 			if (switch_channel_has_dtmf(channel)) {
-				if (!args->input_callback && !args->buf) {
+				if (!args->input_callback && !args->buf && !args->dmachine) {
 					status = SWITCH_STATUS_BREAK;
 					break;
 				}
@@ -271,6 +271,12 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_sleep(switch_core_session_t *session,
 			break;
 		}
 
+		if (args && args->dmachine) {
+			if ((status = switch_ivr_dmachine_ping(args->dmachine, NULL)) != SWITCH_STATUS_SUCCESS) {
+				break;
+			}
+		}
+
 		if (sval && write_frame.datalen) {
 			switch_generate_sln_silence((int16_t *) write_frame.data, write_frame.samples, sval);
 			switch_core_session_write_frame(session, &write_frame, SWITCH_IO_FLAG_NONE, 0);
@@ -923,12 +929,21 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_collect_digits_callback(switch_core_s
 
 
 		if (switch_channel_has_dtmf(channel)) {
-			if (!args->input_callback && !args->buf) {
+			if (!args->input_callback && !args->buf && !args->dmachine) {
 				status = SWITCH_STATUS_BREAK;
 				break;
 			}
 			switch_channel_dequeue_dtmf(channel, &dtmf);
-			status = args->input_callback(session, (void *) &dtmf, SWITCH_INPUT_TYPE_DTMF, args->buf, args->buflen);
+
+			if (args->dmachine) {
+				char ds[2] = {dtmf.digit, '\0'};
+				if ((status = switch_ivr_dmachine_feed(args->dmachine, ds, NULL)) != SWITCH_STATUS_SUCCESS) {
+					break;
+				}
+			} else if (args->input_callback) {
+				status = args->input_callback(session, (void *) &dtmf, SWITCH_INPUT_TYPE_DTMF, args->buf, args->buflen);
+			}
+
 			if (digit_timeout) {
 				digit_started = switch_micro_time_now();
 			}
diff --git a/src/switch_ivr_play_say.c b/src/switch_ivr_play_say.c
index fd2f1a98fb..c99745d57c 100644
--- a/src/switch_ivr_play_say.c
+++ b/src/switch_ivr_play_say.c
@@ -842,7 +842,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_gentones(switch_core_session_t *sessi
 			   if you return anything but SWITCH_STATUS_SUCCESS the playback will stop.
 			 */
 			if (switch_channel_has_dtmf(channel)) {
-				if (!args->input_callback && !args->buf) {
+				if (!args->input_callback && !args->buf && !args->dmachine) {
 					status = SWITCH_STATUS_BREAK;
 					done = 1;
 					break;
@@ -1253,7 +1253,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_play_file(switch_core_session_t *sess
 				   if you return anything but SWITCH_STATUS_SUCCESS the playback will stop.
 				 */
 				if (switch_channel_has_dtmf(channel)) {
-					if (!args->input_callback && !args->buf) {
+					if (!args->input_callback && !args->buf && !args->dmachine) {
 						status = SWITCH_STATUS_BREAK;
 						done = 1;
 						break;
@@ -1959,7 +1959,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_speak_text_handle(switch_core_session
 			 * if you return anything but SWITCH_STATUS_SUCCESS the playback will stop.
 			 */
 			if (switch_channel_has_dtmf(channel)) {
-				if (!args->input_callback && !args->buf) {
+				if (!args->input_callback && !args->buf && !args->dmachine) {
 					status = SWITCH_STATUS_BREAK;
 					done = 1;
 					break;