[Freeswitch-branches] [commit] r3324 - freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference

[Freeswitch SVN]

Author: knhor
Date: Sat Nov 11 22:06:12 2006
New Revision: 3324

Modified:
   freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c

Log:
clean up for new digit stream function usage

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	Sat Nov 11 22:06:12 2006
@@ -762,6 +762,8 @@
 		switch_core_hash_delete(globals.conference_hash, conference->name);
 		switch_mutex_unlock(globals.hash_mutex);
 
+		switch_ivr_digit_stream_parser_destroy(&conference->dtmf_parser);
+
 		if (conference->pool) {
 			switch_memory_pool_t *pool = conference->pool;
 			switch_core_destroy_memory_pool(&pool);
@@ -3444,7 +3446,7 @@
 	conference->rate = rate;
 	conference->interval = interval;
 
-	if(switch_ivr_digit_stream_parser_new(&conference->dtmf_parser) == SWITCH_STATUS_SUCCESS) {
+	if(switch_ivr_digit_stream_parser_new(conference->pool,&conference->dtmf_parser) == SWITCH_STATUS_SUCCESS) {
 		int i;
 		struct _ccds {
 			char *key;
@@ -3467,8 +3469,8 @@
 		int ccds_qty = sizeof(ccds)/sizeof(ccds[0]);
 
 		// set the default control handler strings
-		for(i=0; status == SWITCH_STATUS_SUCCESS && i<ccds_qty; i++) {
-			status = switch_ivr_digit_stream_parser_set_event(conference->dtmf_parser,ccds[i].key,ccds[i].action);
+		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,ccds[i].action);
 		}
 
 		// parse the profile tree for caller control digit strings