*** mod_fsv_old.c	2011-01-19 14:53:49.000000000 -0500
--- mod_fsv.c	2011-01-19 19:16:23.000000000 -0500
***************
*** 63,69 ****
  	int bytes;
  
  	eh->up = 1;
! 	while (switch_channel_ready(channel)) {
  		status = switch_core_session_read_video_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, 0);
  
  		if (!SWITCH_READ_ACCEPTABLE(status)) {
--- 63,69 ----
  	int bytes;
  
  	eh->up = 1;
! 	while (switch_channel_ready(channel) && eh->up) {
  		status = switch_core_session_read_video_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, 0);
  
  		if (!SWITCH_READ_ACCEPTABLE(status)) {
***************
*** 108,118 ****
--- 108,120 ----
  	switch_mutex_t *mutex = NULL;
  	switch_codec_t codec, *vid_codec;
  	switch_codec_implementation_t read_impl = { 0 };
+ 	switch_dtmf_t dtmf = { 0 };
  	int count = 0, sanity = 30;
  
  	switch_core_session_get_read_impl(session, &read_impl);
  	switch_channel_answer(channel);
  
+ 	switch_channel_set_variable(channel, SWITCH_PLAYBACK_TERMINATOR_USED, "");
  
  	while (switch_channel_up(channel) && !switch_channel_test_flag(channel, CF_VIDEO)) {
  		switch_yield(10000);
***************
*** 125,130 ****
--- 127,133 ----
  			if (!--sanity) {
  				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "%s timeout waiting for video.\n", 
  								  switch_channel_get_name(channel));
+ 				switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE, "Got timeout while waiting for video");
  				return;
  			}
  		}
***************
*** 132,142 ****
--- 135,147 ----
  	
  	if (!switch_channel_ready(channel)) {
  		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "%s not ready.\n", switch_channel_get_name(channel));
+ 		switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE, "Channel not ready");
  		return;
  	}
  
  	if ((fd = open((char *) data, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, S_IRUSR | S_IWUSR)) < 0) {
  		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Error opening file %s\n", (char *) data);
+ 		switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE, "Got error while opening file");
  		return;
  	}
  
***************
*** 150,155 ****
--- 155,161 ----
  		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Audio Codec Activation Success\n");
  	} else {
  		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Audio Codec Activation Fail\n");
+ 		switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE, "Audio codec activation failed");
  		goto end;
  	}
  
***************
*** 170,175 ****
--- 176,182 ----
  		h.audio_ptime = read_impl.microseconds_per_packet / 1000;
  
  		if (write(fd, &h, sizeof(h)) != sizeof(h)) {
+ 			switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE, "File write failed");
  			goto end;
  		}
  
***************
*** 186,194 ****
  
  	while (switch_channel_ready(channel)) {
  
! 		status = switch_core_session_read_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, 0);
  
  		if (!SWITCH_READ_ACCEPTABLE(status)) {
  			break;
  		}
  
--- 193,226 ----
  
  	while (switch_channel_ready(channel)) {
  
! 		status = switch_core_session_read_frame(session, &read_frame, SWITCH_IO_FLAG_SINGLE_READ, 0);
! 
! 		if (switch_channel_test_flag(channel, CF_BREAK)) {
! 			switch_channel_clear_flag(channel, CF_BREAK);
! 			eh.up = 0;
! 			break;
! 		}
! 
! 		switch_ivr_parse_all_events(session);
! 
! 		if (switch_channel_has_dtmf(channel)) {
! 			const char * terminators = switch_channel_get_variable(channel, SWITCH_PLAYBACK_TERMINATORS_VARIABLE);
! 			switch_channel_dequeue_dtmf(channel, &dtmf);
! 
! 			if (terminators && !strcasecmp(terminators, "none")) terminators = NULL;
! 
! 			if (terminators && strchr(terminators, dtmf.digit)) {
! 
! 				char sbuf[2] = {dtmf.digit, '\0'};
! 				switch_snprintf(sbuf, sizeof(sbuf), "%c", dtmf.digit);
! 				switch_channel_set_variable(channel, SWITCH_PLAYBACK_TERMINATOR_USED, sbuf);
! 				eh.up = 0;
! 				break;
! 			}
! 		}
  
  		if (!SWITCH_READ_ACCEPTABLE(status)) {
+ 			eh.up = 0;
  			break;
  		}
  
***************
*** 219,224 ****
--- 251,257 ----
  		}
  	}
  
+ 	switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE, "OK");
  
    end:
  
***************
*** 248,254 ****
--- 281,290 ----
  	uint32_t ts = 0, last = 0;
  	switch_timer_t timer = { 0 };
  	switch_payload_t pt = 0;
+ 	switch_dtmf_t dtmf = { 0 };
+ 	switch_frame_t *read_frame;
  	switch_codec_implementation_t read_impl = { 0 };
+ 
  	switch_core_session_get_read_impl(session, &read_impl);
  
  	aud_buffer = switch_core_session_alloc(session, SWITCH_RECOMMENDED_BUFFER_SIZE);
***************
*** 254,271 ****
--- 290,312 ----
  	aud_buffer = switch_core_session_alloc(session, SWITCH_RECOMMENDED_BUFFER_SIZE);
  	vid_buffer = switch_core_session_alloc(session, SWITCH_RECOMMENDED_BUFFER_SIZE);
  
+ 	switch_channel_set_variable(channel, SWITCH_PLAYBACK_TERMINATOR_USED, "");
+ 
  	if ((fd = open((char *) data, O_RDONLY | O_BINARY)) < 0) {
  		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Error opening file %s\n", (char *) data);
+ 		switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE, "Got error while opening file");
  		return;
  	}
  
  	if (read(fd, &h, sizeof(h)) != sizeof(h)) {
  		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Error reading file header\n");
+ 		switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE, "Got error reading file header");
  		goto end;
  	}
  
  	if (h.version != VERSION) {
  		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "File version does not match!\n");
+ 		switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE, "File version does not match!");
  		goto end;
  	}
  
***************
*** 290,295 ****
--- 331,337 ----
  	if (switch_core_timer_init(&timer, "soft", read_impl.microseconds_per_packet / 1000,
  							   read_impl.samples_per_packet, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) {
  		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Timer Activation Fail\n");
+ 		switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE, "Timer activation failed!");
  		goto end;
  	}
  
***************
*** 303,308 ****
--- 345,351 ----
  		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Audio Codec Activation Success\n");
  	} else {
  		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Audio Codec Activation Fail\n");
+ 		switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE, "Audio codec activation failed");
  		goto end;
  	}
  
***************
*** 316,321 ****
--- 359,365 ----
  		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Video Codec Activation Success\n");
  	} else {
  		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Video Codec Activation Fail\n");
+ 		switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE, "Video codec activation failed");
  		goto end;
  	}
  	switch_core_session_set_read_codec(session, &codec);
***************
*** 358,367 ****
  			}
  			switch_core_session_write_frame(session, &write_frame, SWITCH_IO_FLAG_NONE, 0);
  			switch_core_timer_next(&timer);
- 		}
  
  	}
  
    end:
  
  	if (timer.interval) {
--- 402,437 ----
  			}
  			switch_core_session_write_frame(session, &write_frame, SWITCH_IO_FLAG_NONE, 0);
  			switch_core_timer_next(&timer);
  
+ 			switch_core_session_read_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, 0);
+ 
+ 			if (switch_channel_test_flag(channel, CF_BREAK)) {
+ 				switch_channel_clear_flag(channel, CF_BREAK);
+ 				break;
+ 			}
+ 
+ 			switch_ivr_parse_all_events(session);
+ 
+ 			if (switch_channel_has_dtmf(channel)) {
+ 				const char * terminators = switch_channel_get_variable(channel, SWITCH_PLAYBACK_TERMINATORS_VARIABLE);
+ 				switch_channel_dequeue_dtmf(channel, &dtmf);
+ 
+ 				if (terminators && !strcasecmp(terminators, "none")) terminators = NULL;
+ 
+ 				if (terminators && strchr(terminators, dtmf.digit)) {
+ 
+ 					char sbuf[2] = {dtmf.digit, '\0'};
+ 					switch_snprintf(sbuf, sizeof(sbuf), "%c", dtmf.digit);
+ 					switch_channel_set_variable(channel, SWITCH_PLAYBACK_TERMINATOR_USED, sbuf);
+ 					break;
+ 				}
+ 			}
+ 		}
+ 		
  	}
  
+ 	switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE, "OK");
+ 
    end:
  
  	if (timer.interval) {