Merge branch 'fsorig'

Conflicts:
	libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_cfg.c
	libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_hndl.c
This commit is contained in:
David Yat Sin
2012-04-03 18:08:49 -04:00
940 changed files with 118344 additions and 11720 deletions

View File

@@ -488,6 +488,7 @@ typedef struct ftdm_channel_config {
float rxgain;
float txgain;
uint8_t debugdtmf;
uint8_t dtmf_on_start;
uint32_t dtmfdetect_ms;
uint8_t iostats;
} ftdm_channel_config_t;

View File

@@ -387,6 +387,8 @@ typedef struct {
typedef struct {
uint32_t duration_ms;
ftdm_time_t start_time;
/* If set to 1, we will send DTMF event the the tone starts, instead of waiting for end */
uint8_t trigger_on_start;
} ftdm_dtmf_detect_t;
/* 2^8 table size, one for each byte (sample) value */