[Freeswitch-branches] [commit] r3263 - freeswitch/branches/knhor/wip/mod_conference

[Freeswitch SVN]

Author: knhor
Date: Sun Nov  5 10:41:30 2006
New Revision: 3263

Modified:
   freeswitch/branches/knhor/wip/mod_conference/mod_conference.c

Log:
add Member-ID descriptor to add-member and del-member. fix code before declaration. fix compiler data type warning

Modified: freeswitch/branches/knhor/wip/mod_conference/mod_conference.c
==============================================================================
--- freeswitch/branches/knhor/wip/mod_conference/mod_conference.c	(original)
+++ freeswitch/branches/knhor/wip/mod_conference/mod_conference.c	Sun Nov  5 10:41:30 2006
@@ -433,6 +433,7 @@
 			switch_channel_event_set_data(channel, event);
 
 			switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", conference->name);
+			switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id);
 			switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "add-member");
 			switch_event_fire(&event);
 		}
@@ -501,6 +502,7 @@
 			switch_channel_event_set_data(channel, event);
 
 			switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", conference->name);
+			switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id);
 			switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "del-member");
 			switch_event_fire(&event);
 		}
@@ -1021,9 +1023,10 @@
 		}
 
 		if (switch_channel_has_dtmf(channel)) {
-			switch_channel_dequeue_dtmf(channel, dtmf, sizeof(dtmf));
 			char *pcontroldigit;
 
+			switch_channel_dequeue_dtmf(channel, dtmf, sizeof(dtmf));
+
 			for (digit = dtmf; *digit; digit++) {
 				// The position of the dialed digit in the control string
 				// determines the operation that is being requested
@@ -3483,7 +3486,8 @@
 /* Called by FreeSWITCH when the module loads */
 SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **module_interface, char *filename)
 {
-	int i,nl,ol=0;
+	int i;
+	size_t nl,ol=0;
 	char *p = NULL;
 
 	switch_status_t status = SWITCH_STATUS_SUCCESS;