From: Moises Silva <moy@sangoma.com>
Date: Sun, 9 Nov 2014 08:50:07 +0000 (-0500)
Subject: Merge remote-tracking branch 'moystash/em-suspend-support'
X-Git-Tag: v1.4.14~2^2~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb3049168880cb490f197ba2bc75368358338a4c;p=thirdparty%2Ffreeswitch.git

Merge remote-tracking branch 'moystash/em-suspend-support'

Conflicts:
	libs/freetdm/src/include/private/ftdm_core.h
---

eb3049168880cb490f197ba2bc75368358338a4c
diff --cc libs/freetdm/mod_freetdm/mod_freetdm.c
index 846f9cb789,e9fbba34d4..e8468c0394
mode 100644,100755..100644
--- a/libs/freetdm/mod_freetdm/mod_freetdm.c
+++ b/libs/freetdm/mod_freetdm/mod_freetdm.c
diff --cc libs/freetdm/src/include/private/ftdm_core.h
index f4a1fe4e29,15d8ff248b..609198e731
--- a/libs/freetdm/src/include/private/ftdm_core.h
+++ b/libs/freetdm/src/include/private/ftdm_core.h
@@@ -513,8 -514,8 +514,9 @@@ struct ftdm_span 
  	ftdm_span_stop_t stop;
  	ftdm_channel_sig_read_t sig_read;
  	ftdm_channel_sig_write_t sig_write;
 -	ftdm_channel_sig_dtmf_t sig_dtmf;
 +	ftdm_channel_sig_dtmf_t sig_queue_dtmf;
 +	ftdm_channel_sig_dtmf_t sig_send_dtmf;
+ 	uint32_t sig_release_guard_time_ms;
  	ftdm_channel_state_processor_t state_processor; /*!< This guy is called whenever state processing is required */
  	void *io_data; /*!< Private I/O data per span. Do not touch unless you are an I/O module */
  	char *type;