Author: knhor Date: Sat Oct 21 23:30:15 2006 New Revision: 3149 Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c Log: rename conference_list_itterator to conference_member_itterator so that it matches trunk 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 Oct 21 23:30:15 2006 @@ -233,7 +233,7 @@ static switch_status_t chat_send(char *proto, char *from, char *to, char *subject, char *body, char *hint); static void launch_conference_record_thread(conference_obj_t *conference, char *path); -static void conference_list_itterator(conference_obj_t *conference, +static void conference_member_itterator(conference_obj_t *conference, switch_stream_handle_t *stream, int (*pfncallback)(conference_obj_t*, conference_member_t*, int, switch_stream_handle_t*, void*), void *data); @@ -1484,7 +1484,7 @@ return SWITCH_STATUS_SUCCESS; } -static void conference_list_itterator(conference_obj_t *conference, switch_stream_handle_t *stream, int (*pfncallback)(conference_obj_t*, conference_member_t*, int, switch_stream_handle_t*, void*), void *data) +static void conference_member_itterator(conference_obj_t *conference, switch_stream_handle_t *stream, int (*pfncallback)(conference_obj_t*, conference_member_t*, int, switch_stream_handle_t*, void*), void *data) { conference_member_t *member = NULL; @@ -2077,7 +2077,7 @@ conference_function_mute_member(conference, NULL, id, stream, NULL); goto done; } else { - conference_list_itterator(conference, stream, &conference_function_mute_member, NULL); + conference_member_itterator(conference, stream, &conference_function_mute_member, NULL); goto done; } } else { @@ -2093,7 +2093,7 @@ conference_function_unmute_member(conference, NULL, id, stream, NULL); goto done; } else { - conference_list_itterator(conference, stream, &conference_function_unmute_member, NULL); + conference_member_itterator(conference, stream, &conference_function_unmute_member, NULL); goto done; } } else { @@ -2109,7 +2109,7 @@ conference_function_deaf_member(conference, NULL, id, stream, NULL); goto done; } else { - conference_list_itterator(conference, stream, &conference_function_deaf_member, NULL); + conference_member_itterator(conference, stream, &conference_function_deaf_member, NULL); goto done; } } else { @@ -2125,7 +2125,7 @@ conference_function_undeaf_member(conference, NULL, id, stream, NULL); goto done; } else { - conference_list_itterator(conference, stream, &conference_function_undeaf_member, NULL); + conference_member_itterator(conference, stream, &conference_function_undeaf_member, NULL); goto done; } } else { @@ -2151,7 +2151,7 @@ conference_function_kick_member(conference, NULL, id, stream, NULL); goto done; } else { - conference_list_itterator(conference, stream, &conference_function_kick_member, NULL); + conference_member_itterator(conference, stream, &conference_function_kick_member, NULL); goto done; } } else {