November 2006 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r3360 - in freeswitch/branches/tholo: . build conf docs libs mac patches scripts src support w32
by Freeswitch SVN 14 Nov '06

14 Nov '06

Author: tholo Date: Mon Nov 13 22:42:22 2006 New Revision: 3360 Removed: freeswitch/branches/tholo/.indent.pro freeswitch/branches/tholo/AUTHORS freeswitch/branches/tholo/COPYING freeswitch/branches/tholo/ChangeLog freeswitch/branches/tholo/Freeswitch.sln freeswitch/branches/tholo/INSTALL freeswitch/branches/tholo/Makefile.am freeswitch/branches/tholo/Makefile.in freeswitch/branches/tholo/NEWS freeswitch/branches/tholo/README freeswitch/branches/tholo/aclocal.m4 freeswitch/branches/tholo/build/ freeswitch/branches/tholo/build.sh freeswitch/branches/tholo/conf/ freeswitch/branches/tholo/configure freeswitch/branches/tholo/configure.in freeswitch/branches/tholo/docs/ freeswitch/branches/tholo/generic_mod.mk freeswitch/branches/tholo/indent_options.sh freeswitch/branches/tholo/libs/ freeswitch/branches/tholo/mac/ freeswitch/branches/tholo/mkinstalldirs freeswitch/branches/tholo/modules.conf.in freeswitch/branches/tholo/patches/ freeswitch/branches/tholo/scripts/ freeswitch/branches/tholo/src/ freeswitch/branches/tholo/support/ freeswitch/branches/tholo/w32/ Modified: freeswitch/branches/tholo/ (props changed) Log: Remove outdated trunk copy

1 0

[commit] r3359 - freeswitch/branches/jkr888/trunk
by Freeswitch SVN 14 Nov '06

14 Nov '06

Author: jkr888 Date: Mon Nov 13 22:39:56 2006 New Revision: 3359 Added: freeswitch/branches/jkr888/trunk/ - copied from r3358, /freeswitch/trunk/ Log:

1 0

[commit] r3358 - freeswitch/branches/jkr888/trunk
by Freeswitch SVN 14 Nov '06

14 Nov '06

Author: jkr888 Date: Mon Nov 13 22:39:31 2006 New Revision: 3358 Removed: freeswitch/branches/jkr888/trunk/ Log:

1 0

[commit] r3357 - freeswitch/branches/jkr888/trunk
by Freeswitch SVN 14 Nov '06

14 Nov '06

Author: jkr888 Date: Mon Nov 13 22:38:30 2006 New Revision: 3357 Added: freeswitch/branches/jkr888/trunk/ - copied from r3356, /freeswitch/trunk/ Log:

1 0

[commit] r3356 - in freeswitch/branches/jkr888: . build conf docs libs mac patches scripts w32
by Freeswitch SVN 14 Nov '06

14 Nov '06

Author: jkr888 Date: Mon Nov 13 22:35:53 2006 New Revision: 3356 Removed: freeswitch/branches/jkr888/README freeswitch/branches/jkr888/aclocal.m4 freeswitch/branches/jkr888/build/ freeswitch/branches/jkr888/build.sh freeswitch/branches/jkr888/conf/ freeswitch/branches/jkr888/configure freeswitch/branches/jkr888/configure.in freeswitch/branches/jkr888/docs/ freeswitch/branches/jkr888/generic_mod.mk freeswitch/branches/jkr888/indent_options.sh freeswitch/branches/jkr888/libs/ freeswitch/branches/jkr888/mac/ freeswitch/branches/jkr888/mkinstalldirs freeswitch/branches/jkr888/modules.conf.in freeswitch/branches/jkr888/patches/ freeswitch/branches/jkr888/scripts/ freeswitch/branches/jkr888/w32/ Log:

1 0

[commit] r3355 - freeswitch/branches/jkr888
by Freeswitch SVN 14 Nov '06

14 Nov '06

Author: jkr888 Date: Mon Nov 13 22:26:51 2006 New Revision: 3355 Removed: freeswitch/branches/jkr888/COPYING freeswitch/branches/jkr888/ChangeLog freeswitch/branches/jkr888/INSTALL freeswitch/branches/jkr888/Makefile.am freeswitch/branches/jkr888/Makefile.in freeswitch/branches/jkr888/NEWS Log:

1 0

[commit] r3354 - freeswitch/branches/jkr888
by Freeswitch SVN 14 Nov '06

14 Nov '06

Author: jkr888 Date: Mon Nov 13 22:20:44 2006 New Revision: 3354 Removed: freeswitch/branches/jkr888/AUTHORS Log:

1 0

[commit] r3353 - freeswitch/branches/jkr888
by Freeswitch SVN 14 Nov '06

14 Nov '06

Author: jkr888 Date: Mon Nov 13 22:19:59 2006 New Revision: 3353 Removed: freeswitch/branches/jkr888/.indent.pro Log:

1 0

[commit] r3352 - freeswitch/branches/jkr888/Freeswitch
by Freeswitch SVN 14 Nov '06

14 Nov '06

Author: jkr888 Date: Mon Nov 13 22:14:02 2006 New Revision: 3352 Removed: freeswitch/branches/jkr888/Freeswitch/ Log:

1 0

[commit] r3351 - freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 14 Nov '06

14 Nov '06

Author: knhor Date: Mon Nov 13 20:36:51 2006 New Revision: 3351 Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c Log: rescope the default caller control digits table. use pointers to the default caller control actions instead of casting to/from int when passing through switch_ivr_digit_stream_parser_xxx Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c Mon Nov 13 20:36:51 2006 @@ -72,6 +72,26 @@ CALLER_CONTROL_HANGUP, } caller_control_t; +static struct _caller_control_actions_struct { + char *key; + char *default_digits; + caller_control_t action; +} caller_control_actions[] = { + {"mute", "0", CALLER_CONTROL_MUTE}, + {"deaf mute", "*", CALLER_CONTROL_DEAF_MUTE}, + {"energy up", "9", CALLER_CONTROL_ENERGY_UP}, + {"energy equ", "8", CALLER_CONTROL_ENERGY_EQU_CONFERENCE}, + {"energy dn", "7", CALLER_CONTROL_ENERGEY_DN}, + {"vol talk up", "3", CALLER_CONTROL_VOL_TALK_UP}, + {"vol talk zero", "2", CALLER_CONTROL_VOL_TALK_ZERO}, + {"vol talk dn", "1", CALLER_CONTROL_VOL_TALK_DN}, + {"vol listen up", "6", CALLER_CONTROL_VOL_LISTEN_UP}, + {"vol listen zero", "5", CALLER_CONTROL_VOL_LISTEN_ZERO}, + {"vol listen dn", "4", CALLER_CONTROL_VOL_LISTEN_DN}, + {"hangup", "#", CALLER_CONTROL_HANGUP}, +}; +#define CALLER_CONTROL_ACTIONS_QTY (sizeof(caller_control_actions)/sizeof(caller_control_actions[0])) + /* Global Values */ static struct { switch_memory_pool_t *conference_pool; @@ -1019,46 +1039,50 @@ if(member->conference->dtmf_parser != NULL) { for (digit = dtmf; *digit; digit++) { - switch((int)switch_ivr_digit_stream_parser_feed(member->conference->dtmf_parser, *digit)) { - case CALLER_CONTROL_NOEVENT: - // the digit string collected so far has not been recognized + int *action = (int *)switch_ivr_digit_stream_parser_feed(member->conference->dtmf_parser, *digit); + + if (action != NULL) { + switch(*action) { + case CALLER_CONTROL_NOEVENT: + // the digit string collected so far has not been recognized + break; + case CALLER_CONTROL_MUTE: + conference_loop_fn_mute_toggle(member); + break; + case CALLER_CONTROL_DEAF_MUTE: + conference_loop_fn_deafmute_toggle(member); + break; + case CALLER_CONTROL_ENERGY_UP: + conference_loop_fn_energy_up(member); + break; + case CALLER_CONTROL_ENERGY_EQU_CONFERENCE: + conference_loop_fn_energy_equ_conference(member); + break; + case CALLER_CONTROL_ENERGEY_DN: + conference_loop_fn_energy_dn(member); + break; + case CALLER_CONTROL_VOL_TALK_UP: + conference_loop_fn_volume_talk_up(member); + break; + case CALLER_CONTROL_VOL_TALK_ZERO: + conference_loop_fn_volume_talk_zero(member); + break; + case CALLER_CONTROL_VOL_TALK_DN: + conference_loop_fn_volume_talk_dn(member); + break; + case CALLER_CONTROL_VOL_LISTEN_UP: + conference_loop_fn_volume_listen_up(member); + break; + case CALLER_CONTROL_VOL_LISTEN_ZERO: + conference_loop_fn_volume_listen_zero(member); + break; + case CALLER_CONTROL_VOL_LISTEN_DN: + conference_loop_fn_volume_listen_dn(member); + break; + case CALLER_CONTROL_HANGUP: + conference_loop_fn_hangup(member); break; - case CALLER_CONTROL_MUTE: - conference_loop_fn_mute_toggle(member); - break; - case CALLER_CONTROL_DEAF_MUTE: - conference_loop_fn_deafmute_toggle(member); - break; - case CALLER_CONTROL_ENERGY_UP: - conference_loop_fn_energy_up(member); - break; - case CALLER_CONTROL_ENERGY_EQU_CONFERENCE: - conference_loop_fn_energy_equ_conference(member); - break; - case CALLER_CONTROL_ENERGEY_DN: - conference_loop_fn_energy_dn(member); - break; - case CALLER_CONTROL_VOL_TALK_UP: - conference_loop_fn_volume_talk_up(member); - break; - case CALLER_CONTROL_VOL_TALK_ZERO: - conference_loop_fn_volume_talk_zero(member); - break; - case CALLER_CONTROL_VOL_TALK_DN: - conference_loop_fn_volume_talk_dn(member); - break; - case CALLER_CONTROL_VOL_LISTEN_UP: - conference_loop_fn_volume_listen_up(member); - break; - case CALLER_CONTROL_VOL_LISTEN_ZERO: - conference_loop_fn_volume_listen_zero(member); - break; - case CALLER_CONTROL_VOL_LISTEN_DN: - conference_loop_fn_volume_listen_dn(member); - break; - case CALLER_CONTROL_HANGUP: - conference_loop_fn_hangup(member); - break; + } } } } @@ -3447,25 +3471,6 @@ conference->interval = interval; if(switch_ivr_digit_stream_parser_new(conference->pool,&conference->dtmf_parser) == SWITCH_STATUS_SUCCESS) { - struct _ccds { - char *key; - char *digits; - caller_control_t action; - } ccds[] = { - {"mute", "0", CALLER_CONTROL_MUTE}, - {"deaf mute", "*", CALLER_CONTROL_DEAF_MUTE}, - {"energy up", "9", CALLER_CONTROL_ENERGY_UP}, - {"energy equ", "8", CALLER_CONTROL_ENERGY_EQU_CONFERENCE}, - {"energy dn", "7", CALLER_CONTROL_ENERGEY_DN}, - {"vol talk up", "3", CALLER_CONTROL_VOL_TALK_UP}, - {"vol talk zero", "2", CALLER_CONTROL_VOL_TALK_ZERO}, - {"vol talk dn", "1", CALLER_CONTROL_VOL_TALK_DN}, - {"vol listen up", "6", CALLER_CONTROL_VOL_LISTEN_UP}, - {"vol listen zero", "5", CALLER_CONTROL_VOL_LISTEN_ZERO}, - {"vol listen dn", "4", CALLER_CONTROL_VOL_LISTEN_DN}, - {"hangup", "#", CALLER_CONTROL_HANGUP}, - }; - int ccds_qty = sizeof(ccds)/sizeof(ccds[0]); int i; // count the number of caller control definitons in the profile @@ -3474,8 +3479,10 @@ } // map in the default control handler strings only if the profile has no caller control definitions if (i == 0) { - for(i=0,status=SWITCH_STATUS_SUCCESS; status == SWITCH_STATUS_SUCCESS && i<ccds_qty; i++) { - status = switch_ivr_digit_stream_parser_set_event(conference->dtmf_parser,ccds[i].digits,(void *)ccds[i].action); + for(i=0,status=SWITCH_STATUS_SUCCESS; status == SWITCH_STATUS_SUCCESS && i<CALLER_CONTROL_ACTIONS_QTY; i++) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Installing default caller control action name '%s' bound to '%s' digits.\n", + caller_control_actions[i].key,caller_control_actions[i].default_digits); + status = switch_ivr_digit_stream_parser_set_event(conference->dtmf_parser,caller_control_actions[i].default_digits,(void *)&(caller_control_actions[i].action)); } } @@ -3488,9 +3495,10 @@ // scan through all of the valid actions, and if found, // set the new caller control action digit string, then // stop scanning the table, and go to the next xml kvp. - for(i=0,status=SWITCH_STATUS_NOOP; i<ccds_qty && status == SWITCH_STATUS_NOOP; i++) { - if(strcasecmp(ccds[i].key,key) == 0) { - status = switch_ivr_digit_stream_parser_set_event(conference->dtmf_parser,val,(void *)ccds[i].action); + for(i=0,status=SWITCH_STATUS_NOOP; i<CALLER_CONTROL_ACTIONS_QTY && status == SWITCH_STATUS_NOOP; i++) { + if(strcasecmp(caller_control_actions[i].key,key) == 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Installing caller control action name '%s' bound to '%s' digits.\n",key,val); + status = switch_ivr_digit_stream_parser_set_event(conference->dtmf_parser,val,(void *)&caller_control_actions[i].action); } } if(status == SWITCH_STATUS_NOOP) {

1 0