Skip to content

F
freeswitch
提交 d8194e9e authored 作者: William King's avatar William King
浏览文件
操作

FS-7845 File rename to remove mod_* prefix to local module C files. Change 

function name prefixes from shorthand 'conf' to longer form
'conference'. Also fixes the channel variable names which had been
caught in an over zealous perl -pi -e command...
上级 14aa7205
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 1687 行增加 和 1687 行删除
src/mod/applications/mod_conference/Makefile.am
浏览文件 @ d8194e9e
......@@ -2,8 +2,8 @@ include $(top_srcdir)/build/modmake.rulesam
MODNAME=mod_conference
mod_LTLIBRARIES = mod_conference.la
mod_conference_la_SOURCES = mod_conference.c mod_conference_api.c mod_conference_loop.c mod_conference_al.c mod_conference_cdr.c mod_conference_video.c
mod_conference_la_SOURCES += mod_conference_event.c mod_conference_member.c mod_conference_utils.c mod_conference_file.c mod_conference_record.c
mod_conference_la_SOURCES = mod_conference.c conference_api.c conference_loop.c conference_al.c conference_cdr.c conference_video.c
mod_conference_la_SOURCES += conference_event.c conference_member.c conference_utils.c conference_file.c conference_record.c
mod_conference_la_CFLAGS = $(AM_CFLAGS) -I.
mod_conference_la_LIBADD = $(switch_builddir)/libfreeswitch.la
mod_conference_la_LDFLAGS = -avoid-version -module -no-undefined -shared
......
src/mod/applications/mod_conference/mod_conference_al.c → src/mod/applications/mod_conference/conference_al.c
浏览文件 @ d8194e9e
......@@ -43,7 +43,7 @@
al_handle_t *conf_al_create(switch_memory_pool_t *pool)
al_handle_t *conference_al_create(switch_memory_pool_t *pool)
{
al_handle_t *al;
......@@ -54,22 +54,22 @@ al_handle_t *conf_al_create(switch_memory_pool_t *pool)
}
#ifndef OPENAL_POSITIONING
void conf_al_gen_arc(conference_obj_t *conference, switch_stream_handle_t *stream)
void conference_al_gen_arc(conference_obj_t *conference, switch_stream_handle_t *stream)
{
}
void conf_al_process(al_handle_t *al, void *data, switch_size_t datalen, int rate)
void conference_al_process(al_handle_t *al, void *data, switch_size_t datalen, int rate)
{
}
#else
void conf_al_gen_arc(conference_obj_t *conference, switch_stream_handle_t *stream)
void conference_al_gen_arc(conference_obj_t *conference, switch_stream_handle_t *stream)
{
float offset;
float pos;
float radius;
float x, z;
float div = 3.14159f / 180;
conf_member_t *member;
conference_member_t *member;
uint32_t count = 0;
if (!conference->count) {
......@@ -78,14 +78,14 @@ void conf_al_gen_arc(conference_obj_t *conference, switch_stream_handle_t *strea
switch_mutex_lock(conference->member_mutex);
for (member = conference->members; member; member = member->next) {
if (member->channel && conf_utils_member_test_flag(member, MFLAG_CAN_SPEAK) && !conf_utils_member_test_flag(member, MFLAG_NO_POSITIONAL)) {
if (member->channel && conference_utils_member_test_flag(member, MFLAG_CAN_SPEAK) && !conference_utils_member_test_flag(member, MFLAG_NO_POSITIONAL)) {
count++;
}
}
if (count < 3) {
for (member = conference->members; member; member = member->next) {
if (member->channel && !conf_utils_member_test_flag(member, MFLAG_NO_POSITIONAL) && member->al) {
if (member->channel && !conference_utils_member_test_flag(member, MFLAG_NO_POSITIONAL) && member->al) {
member->al->pos_x = 0;
member->al->pos_y = 0;
......@@ -112,14 +112,14 @@ void conf_al_gen_arc(conference_obj_t *conference, switch_stream_handle_t *strea
for (member = conference->members; member; member = member->next) {
if (!member->channel || conf_utils_member_test_flag(member, MFLAG_NO_POSITIONAL) || !conf_utils_member_test_flag(member, MFLAG_CAN_SPEAK)) {
if (!member->channel || conference_utils_member_test_flag(member, MFLAG_NO_POSITIONAL) || !conference_utils_member_test_flag(member, MFLAG_CAN_SPEAK)) {
continue;
}
if (!member->al) {
member->al = conf_al_create(member->pool);
member->al = conference_al_create(member->pool);
}
conf_utils_member_set_flag(member, MFLAG_POSITIONAL);
conference_utils_member_set_flag(member, MFLAG_POSITIONAL);
if (pos == 0) {
x = 0;
......@@ -163,7 +163,7 @@ void conf_al_gen_arc(conference_obj_t *conference, switch_stream_handle_t *strea
void conf_al_process(al_handle_t *al, void *data, switch_size_t datalen, int rate)
void conference_al_process(al_handle_t *al, void *data, switch_size_t datalen, int rate)
{
if (rate != 48000) {
......@@ -180,7 +180,7 @@ void conf_al_process(al_handle_t *al, void *data, switch_size_t datalen, int rat
0
};
switch_mutex_lock(conf_globals.setup_mutex);
switch_mutex_lock(conference_globals.setup_mutex);
if ((al->device = alcLoopbackOpenDeviceSOFT(NULL))) {
const ALshort silence[16] = { 0 };
float orient[6] = { /*fwd:*/ 0., 0., -1., /*up:*/ 0., 1., 0. };
......@@ -205,7 +205,7 @@ void conf_al_process(al_handle_t *al, void *data, switch_size_t datalen, int rat
alSourceQueueBuffers(al->source, 2, al->buffer_in);
alSourcePlay(al->source);
}
switch_mutex_unlock(conf_globals.setup_mutex);
switch_mutex_unlock(conference_globals.setup_mutex);
}
if (al->device) {
......@@ -238,13 +238,13 @@ void conf_al_process(al_handle_t *al, void *data, switch_size_t datalen, int rat
#endif
#ifndef OPENAL_POSITIONING
switch_status_t conf_al_parse_position(al_handle_t *al, const char *data)
switch_status_t conference_al_parse_position(al_handle_t *al, const char *data)
{
return SWITCH_STATUS_FALSE;
}
#else
switch_status_t conf_al_parse_position(al_handle_t *al, const char *data)
switch_status_t conference_al_parse_position(al_handle_t *al, const char *data)
{
char *args[3];
int num;
......@@ -270,11 +270,11 @@ switch_status_t conf_al_parse_position(al_handle_t *al, const char *data)
#endif
#ifdef OPENAL_POSITIONING
void conf_al_close(al_handle_t *al)
void conference_al_close(al_handle_t *al)
{
if (!al) return;
switch_mutex_lock(conf_globals.setup_mutex);
switch_mutex_lock(conference_globals.setup_mutex);
if (al->source) {
alDeleteSources(1, &al->source);
al->source = 0;
......@@ -295,7 +295,7 @@ void conf_al_close(al_handle_t *al)
alcCloseDevice(al->device);
al->device = NULL;
}
switch_mutex_unlock(conf_globals.setup_mutex);
switch_mutex_unlock(conference_globals.setup_mutex);
}
#endif
src/mod/applications/mod_conference/mod_conference_cdr.c → src/mod/applications/mod_conference/conference_cdr.c
浏览文件 @ d8194e9e
......@@ -42,28 +42,28 @@
#include <mod_conference.h>
inline switch_bool_t conf_cdr_test_mflag(conf_cdr_node_t *np, member_flag_t mflag)
inline switch_bool_t conference_cdr_test_mflag(conference_cdr_node_t *np, member_flag_t mflag)
{
return !!np->mflags[mflag];
}
const char *conf_cdr_audio_flow(conf_member_t *member)
const char *conference_cdr_audio_flow(conference_member_t *member)
{
const char *flow = "sendrecv";
if (!conf_utils_member_test_flag(member, MFLAG_CAN_SPEAK)) {
if (!conference_utils_member_test_flag(member, MFLAG_CAN_SPEAK)) {
flow = "recvonly";
}
if (member->channel && switch_channel_test_flag(member->channel, CF_HOLD)) {
flow = conf_utils_member_test_flag(member, MFLAG_CAN_SPEAK) ? "sendonly" : "inactive";
flow = conference_utils_member_test_flag(member, MFLAG_CAN_SPEAK) ? "sendonly" : "inactive";
}
return flow;
}
char *conf_cdr_rfc4579_render(conference_obj_t *conference, switch_event_t *event, switch_event_t *revent)
char *conference_cdr_rfc4579_render(conference_obj_t *conference, switch_event_t *event, switch_event_t *revent)
{
switch_xml_t xml, x_tag, x_tag1, x_tag2, x_tag3, x_tag4;
char tmp[30];
......@@ -71,7 +71,7 @@ char *conf_cdr_rfc4579_render(conference_obj_t *conference, switch_event_t *even
char *dup_domain = NULL;
char *uri;
int off = 0, off1 = 0, off2 = 0, off3 = 0, off4 = 0;
conf_cdr_node_t *np;
conference_cdr_node_t *np;
char *tmpp = tmp;
char *xml_text = NULL;
......@@ -250,7 +250,7 @@ char *conf_cdr_rfc4579_render(conference_obj_t *conference, switch_event_t *even
const char *var;
//char buf[1024];
//switch_snprintf(buf, sizeof(buf), "conf_%s_%s_%s", conference->name, conference->domain, np->cp->caller_id_number);
//switch_snprintf(buf, sizeof(buf), "conference_%s_%s_%s", conference->name, conference->domain, np->cp->caller_id_number);
//switch_channel_set_variable(channel, "conference_call_key", buf);
if (!(x_tag3 = switch_xml_add_child_d(x_tag2, "media", off3++))) {
......@@ -276,7 +276,7 @@ char *conf_cdr_rfc4579_render(conference_obj_t *conference, switch_event_t *even
if (!(x_tag4 = switch_xml_add_child_d(x_tag3, "status", off4++))) {
abort();
}
switch_xml_set_txt_d(x_tag4, conf_cdr_audio_flow(np->member));
switch_xml_set_txt_d(x_tag4, conference_cdr_audio_flow(np->member));
if (switch_channel_test_flag(channel, CF_VIDEO)) {
......@@ -327,13 +327,13 @@ char *conf_cdr_rfc4579_render(conference_obj_t *conference, switch_event_t *even
}
cJSON *conf_cdr_json_render(conference_obj_t *conference, cJSON *req)
cJSON *conference_cdr_json_render(conference_obj_t *conference, cJSON *req)
{
char tmp[30];
const char *domain; const char *name;
char *dup_domain = NULL;
char *uri;
conf_cdr_node_t *np;
conference_cdr_node_t *np;
char *tmpp = tmp;
cJSON *json = cJSON_CreateObject(), *jusers = NULL, *jold_users = NULL, *juser = NULL, *jvars = NULL;
......@@ -437,7 +437,7 @@ cJSON *conf_cdr_json_render(conference_obj_t *conference, cJSON *req)
switch_channel_get_variables(channel, &var_event);
if ((prefix = switch_event_get_header(var_event, "json_conf_var_prefix"))) {
if ((prefix = switch_event_get_header(var_event, "json_conference_var_prefix"))) {
all = strcasecmp(prefix, "__all__");
} else {
prefix = "json_";
......@@ -457,7 +457,7 @@ cJSON *conf_cdr_json_render(conference_obj_t *conference, cJSON *req)
json_add_child_string(juser, "rtpAudioSSRC", var);
}
json_add_child_string(juser, "rtpAudioDirection", conf_cdr_audio_flow(np->member));
json_add_child_string(juser, "rtpAudioDirection", conference_cdr_audio_flow(np->member));
if (switch_channel_test_flag(channel, CF_VIDEO)) {
......@@ -486,7 +486,7 @@ cJSON *conf_cdr_json_render(conference_obj_t *conference, cJSON *req)
return json;
}
void conf_cdr_del(conf_member_t *member)
void conference_cdr_del(conference_member_t *member)
{
if (member->channel) {
switch_channel_get_variables(member->channel, &member->cdr_node->var_event);
......@@ -498,9 +498,9 @@ void conf_cdr_del(conf_member_t *member)
}
}
void conf_cdr_add(conf_member_t *member)
void conference_cdr_add(conference_member_t *member)
{
conf_cdr_node_t *np;
conference_cdr_node_t *np;
switch_caller_profile_t *cp;
switch_channel_t *channel;
......@@ -530,9 +530,9 @@ void conf_cdr_add(conf_member_t *member)
}
void conf_cdr_rejected(conference_obj_t *conference, switch_channel_t *channel, cdr_reject_reason_t reason)
void conference_cdr_rejected(conference_obj_t *conference, switch_channel_t *channel, cdr_reject_reason_t reason)
{
conf_cdr_reject_t *rp;
conference_cdr_reject_t *rp;
switch_caller_profile_t *cp;
rp = switch_core_alloc(conference->pool, sizeof(*rp));
......@@ -549,12 +549,12 @@ void conf_cdr_rejected(conference_obj_t *conference, switch_channel_t *channel,
rp->cp = switch_caller_profile_dup(conference->pool, cp);
}
void conf_cdr_render(conference_obj_t *conference)
void conference_cdr_render(conference_obj_t *conference)
{
switch_xml_t cdr, x_ptr, x_member, x_members, x_conference, x_cp, x_flags, x_tag, x_rejected, x_attempt;
conf_cdr_node_t *np;
conf_cdr_reject_t *rp;
int cdr_off = 0, conf_off = 0;
conference_cdr_node_t *np;
conference_cdr_reject_t *rp;
int cdr_off = 0, conference_off = 0;
char str[512];
char *path = NULL, *xml_text;
int fd;
......@@ -571,30 +571,30 @@ void conf_cdr_render(conference_obj_t *conference)
abort();
}
if (!(x_ptr = switch_xml_add_child_d(x_conference, "name", conf_off++))) {
if (!(x_ptr = switch_xml_add_child_d(x_conference, "name", conference_off++))) {
abort();
}
switch_xml_set_txt_d(x_ptr, conference->name);
if (!(x_ptr = switch_xml_add_child_d(x_conference, "hostname", conf_off++))) {
if (!(x_ptr = switch_xml_add_child_d(x_conference, "hostname", conference_off++))) {
abort();
}
switch_xml_set_txt_d(x_ptr, switch_core_get_hostname());
if (!(x_ptr = switch_xml_add_child_d(x_conference, "rate", conf_off++))) {
if (!(x_ptr = switch_xml_add_child_d(x_conference, "rate", conference_off++))) {
abort();
}
switch_snprintf(str, sizeof(str), "%d", conference->rate);
switch_xml_set_txt_d(x_ptr, str);
if (!(x_ptr = switch_xml_add_child_d(x_conference, "interval", conf_off++))) {
if (!(x_ptr = switch_xml_add_child_d(x_conference, "interval", conference_off++))) {
abort();
}
switch_snprintf(str, sizeof(str), "%d", conference->interval);
switch_xml_set_txt_d(x_ptr, str);
if (!(x_ptr = switch_xml_add_child_d(x_conference, "start_time", conf_off++))) {
if (!(x_ptr = switch_xml_add_child_d(x_conference, "start_time", conference_off++))) {
abort();
}
switch_xml_set_attr_d(x_ptr, "type", "UNIX-epoch");
......@@ -602,17 +602,17 @@ void conf_cdr_render(conference_obj_t *conference)
switch_xml_set_txt_d(x_ptr, str);
if (!(x_ptr = switch_xml_add_child_d(x_conference, "end_time", conf_off++))) {
if (!(x_ptr = switch_xml_add_child_d(x_conference, "end_time", conference_off++))) {
abort();
}
switch_xml_set_attr_d(x_ptr, "endconf_forced", conf_utils_test_flag(conference, CFLAG_ENDCONF_FORCED) ? "true" : "false");
switch_xml_set_attr_d(x_ptr, "endconference_forced", conference_utils_test_flag(conference, CFLAG_ENDCONF_FORCED) ? "true" : "false");
switch_xml_set_attr_d(x_ptr, "type", "UNIX-epoch");
switch_snprintf(str, sizeof(str), "%ld", (long)conference->end_time);
switch_xml_set_txt_d(x_ptr, str);
if (!(x_members = switch_xml_add_child_d(x_conference, "members", conf_off++))) {
if (!(x_members = switch_xml_add_child_d(x_conference, "members", conference_off++))) {
abort();
}
......@@ -621,7 +621,7 @@ void conf_cdr_render(conference_obj_t *conference)
int flag_off = 0;
if (!(x_member = switch_xml_add_child_d(x_members, "member", conf_off++))) {
if (!(x_member = switch_xml_add_child_d(x_members, "member", conference_off++))) {
abort();
}
......@@ -647,16 +647,16 @@ void conf_cdr_render(conference_obj_t *conference)
switch_assert(x_flags);
x_tag = switch_xml_add_child_d(x_flags, "is_moderator", flag_off++);
switch_xml_set_txt_d(x_tag, conf_cdr_test_mflag(np, MFLAG_MOD) ? "true" : "false");
switch_xml_set_txt_d(x_tag, conference_cdr_test_mflag(np, MFLAG_MOD) ? "true" : "false");
x_tag = switch_xml_add_child_d(x_flags, "end_conference", flag_off++);
switch_xml_set_txt_d(x_tag, conf_cdr_test_mflag(np, MFLAG_ENDCONF) ? "true" : "false");
switch_xml_set_txt_d(x_tag, conference_cdr_test_mflag(np, MFLAG_ENDCONF) ? "true" : "false");
x_tag = switch_xml_add_child_d(x_flags, "was_kicked", flag_off++);
switch_xml_set_txt_d(x_tag, conf_cdr_test_mflag(np, MFLAG_KICKED) ? "true" : "false");
switch_xml_set_txt_d(x_tag, conference_cdr_test_mflag(np, MFLAG_KICKED) ? "true" : "false");
x_tag = switch_xml_add_child_d(x_flags, "is_ghost", flag_off++);
switch_xml_set_txt_d(x_tag, conf_cdr_test_mflag(np, MFLAG_GHOST) ? "true" : "false");
switch_xml_set_txt_d(x_tag, conference_cdr_test_mflag(np, MFLAG_GHOST) ? "true" : "false");
if (!(x_cp = switch_xml_add_child_d(x_member, "caller_profile", member_off++))) {
abort();
......@@ -674,7 +674,7 @@ void conf_cdr_render(conference_obj_t *conference)
}
if (!(x_rejected = switch_xml_add_child_d(x_conference, "rejected", conf_off++))) {
if (!(x_rejected = switch_xml_add_child_d(x_conference, "rejected", conference_off++))) {
abort();
}
......
src/mod/applications/mod_conference/mod_conference_file.c → src/mod/applications/mod_conference/conference_file.c
浏览文件 @ d8194e9e
......@@ -45,12 +45,12 @@
switch_status_t conference_file_close(conference_obj_t *conference, conference_file_node_t *node)
{
switch_event_t *event;
conf_member_t *member = NULL;
conference_member_t *member = NULL;
if (test_eflag(conference, EFLAG_PLAY_FILE_DONE) &&
switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
conf_event_add_data(conference, event);
conference_event_add_data(conference, event);
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "seconds", "%ld", (long) node->fh.samples_in / node->fh.native_rate);
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "milliseconds", "%ld", (long) node->fh.samples_in / (node->fh.native_rate / 1000));
......@@ -63,8 +63,8 @@ switch_status_t conference_file_close(conference_obj_t *conference, conference_f
if (node->member_id) {
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "play-file-member-done");
if ((member = conf_member_get(conference, node->member_id))) {
conf_member_add_event_data(member, event);
if ((member = conference_member_get(conference, node->member_id))) {
conference_member_add_event_data(member, event);
switch_thread_rwlock_unlock(member->rwlock);
}
......@@ -83,7 +83,7 @@ switch_status_t conference_file_close(conference_obj_t *conference, conference_f
#ifdef OPENAL_POSITIONING
if (node->al && node->al->device) {
conf_al_close(node->al);
conference_al_close(node->al);
}
#endif
if (switch_core_file_has_video(&node->fh) && conference->canvas) {
......@@ -175,7 +175,7 @@ switch_status_t conference_file_play(conference_obj_t *conference, char *file, u
}
if (!async && say) {
status = conf_say(conference, file + 4, leadin);
status = conference_say(conference, file + 4, leadin);
goto done;
}
......@@ -196,7 +196,7 @@ switch_status_t conference_file_play(conference_obj_t *conference, char *file, u
switch_safe_free(params_portion);
} else if (!async) {
status = conf_say(conference, file, leadin);
status = conference_say(conference, file, leadin);
goto done;
} else {
goto done;
......@@ -232,7 +232,7 @@ switch_status_t conference_file_play(conference_obj_t *conference, char *file, u
flags = SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT;
if (conference->members_with_video && conf_utils_test_flag(conference, CFLAG_TRANSCODE_VIDEO)) {
if (conference->members_with_video && conference_utils_test_flag(conference, CFLAG_TRANSCODE_VIDEO)) {
flags |= SWITCH_FILE_FLAG_VIDEO;
}
......@@ -244,7 +244,7 @@ switch_status_t conference_file_play(conference_obj_t *conference, char *file, u
if (test_eflag(conference, EFLAG_PLAY_FILE) &&
switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
conf_event_add_data(conference, event);
conference_event_add_data(conference, event);
if (fnode->fh.params) {
switch_event_merge(event, conference->fnode->fh.params);
......@@ -271,8 +271,8 @@ switch_status_t conference_file_play(conference_obj_t *conference, char *file, u
}
if (!bad_params && !zstr(position) && conference->channels == 2) {
fnode->al = conf_al_create(pool);
if (conf_al_parse_position(fnode->al, position) != SWITCH_STATUS_SUCCESS) {
fnode->al = conference_al_create(pool);
if (conference_al_parse_position(fnode->al, position) != SWITCH_STATUS_SUCCESS) {
switch_core_file_close(&fnode->fh);
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Position Data.\n");
fnode->al = NULL;
......@@ -288,7 +288,7 @@ switch_status_t conference_file_play(conference_obj_t *conference, char *file, u
fnode->file = switch_core_strdup(fnode->pool, file);
if (!conference->fnode || (async && !conference->async_fnode)) {
conf_video_fnode_check(fnode);
conference_video_fnode_check(fnode);
}
/* Queue the node */
......
src/mod/applications/mod_conference/mod_conference_utils.c → src/mod/applications/mod_conference/conference_utils.c
浏览文件 @ d8194e9e
......@@ -41,7 +41,7 @@
*/
#include <mod_conference.h>
const char *conf_utils_combine_flag_var(switch_core_session_t *session, const char *var_name)
const char *conference_utils_combine_flag_var(switch_core_session_t *session, const char *var_name)
{
switch_event_header_t *hp;
switch_event_t *event, *cevent;
......@@ -85,7 +85,7 @@ const char *conf_utils_combine_flag_var(switch_core_session_t *session, const ch
}
void conf_utils_set_mflags(const char *flags, member_flag_t *f)
void conference_utils_set_mflags(const char *flags, member_flag_t *f)
{
if (flags) {
char *dup = strdup(flags);
......@@ -150,7 +150,7 @@ void conf_utils_set_mflags(const char *flags, member_flag_t *f)
void conf_utils_set_cflags(const char *flags, conference_flag_t *f)
void conference_utils_set_cflags(const char *flags, conference_flag_t *f)
{
if (flags) {
char *dup = strdup(flags);
......@@ -203,7 +203,7 @@ void conf_utils_set_cflags(const char *flags, conference_flag_t *f)
}
void conf_utils_clear_eflags(char *events, uint32_t *f)
void conference_utils_clear_eflags(char *events, uint32_t *f)
{
char buf[512] = "";
char *next = NULL;
......@@ -280,7 +280,7 @@ void conf_utils_clear_eflags(char *events, uint32_t *f)
}
void conf_utils_merge_mflags(member_flag_t *a, member_flag_t *b)
void conference_utils_merge_mflags(member_flag_t *a, member_flag_t *b)
{
int x;
......@@ -289,71 +289,71 @@ void conf_utils_merge_mflags(member_flag_t *a, member_flag_t *b)
}
}
void conf_utils_set_flag(conference_obj_t *conference, conference_flag_t flag)
void conference_utils_set_flag(conference_obj_t *conference, conference_flag_t flag)
{
conference->flags[flag] = 1;
}
void conf_utils_set_flag_locked(conference_obj_t *conference, conference_flag_t flag)
void conference_utils_set_flag_locked(conference_obj_t *conference, conference_flag_t flag)
{
switch_mutex_lock(conference->flag_mutex);
conference->flags[flag] = 1;
switch_mutex_unlock(conference->flag_mutex);
}
void conf_utils_clear_flag(conference_obj_t *conference, conference_flag_t flag)
void conference_utils_clear_flag(conference_obj_t *conference, conference_flag_t flag)
{
conference->flags[flag] = 0;
}
void conf_utils_clear_flag_locked(conference_obj_t *conference, conference_flag_t flag)
void conference_utils_clear_flag_locked(conference_obj_t *conference, conference_flag_t flag)
{
switch_mutex_lock(conference->flag_mutex);
conference->flags[flag] = 0;
switch_mutex_unlock(conference->flag_mutex);
}
switch_bool_t conf_utils_test_flag(conference_obj_t *conference, conference_flag_t flag)
switch_bool_t conference_utils_test_flag(conference_obj_t *conference, conference_flag_t flag)
{
return !!conference->flags[flag];
}
#if 0
void conf_utils_conf_utils_set_mflag(conference_obj_t *conference, member_flag_t mflag)
void conference_utils_conference_utils_set_mflag(conference_obj_t *conference, member_flag_t mflag)
{
conference->mflags[mflag] = 1;
}
void conf_utils_clear_mflag(conference_obj_t *conference, member_flag_t mflag)
void conference_utils_clear_mflag(conference_obj_t *conference, member_flag_t mflag)
{
conference->mflags[mflag] = 0;
}
switch_bool_t conf_utils_test_mflag(conference_obj_t *conference, member_flag_t mflag)
switch_bool_t conference_utils_test_mflag(conference_obj_t *conference, member_flag_t mflag)
{
return !!conference->mflags[mflag];
}
#endif
void conf_utils_member_set_flag(conf_member_t *member, member_flag_t flag)
void conference_utils_member_set_flag(conference_member_t *member, member_flag_t flag)
{
member->flags[flag] = 1;
}
void conf_utils_member_set_flag_locked(conf_member_t *member, member_flag_t flag)
void conference_utils_member_set_flag_locked(conference_member_t *member, member_flag_t flag)
{
switch_mutex_lock(member->flag_mutex);
member->flags[flag] = 1;
switch_mutex_unlock(member->flag_mutex);
}
void conf_utils_member_clear_flag(conf_member_t *member, member_flag_t flag)
void conference_utils_member_clear_flag(conference_member_t *member, member_flag_t flag)
{
member->flags[flag] = 0;
}
void conf_utils_member_clear_flag_locked(conf_member_t *member, member_flag_t flag)
void conference_utils_member_clear_flag_locked(conference_member_t *member, member_flag_t flag)
{
switch_mutex_lock(member->flag_mutex);
member->flags[flag] = 0;
switch_mutex_unlock(member->flag_mutex);
}
switch_bool_t conf_utils_member_test_flag(conf_member_t *member, member_flag_t flag)
switch_bool_t conference_utils_member_test_flag(conference_member_t *member, member_flag_t flag)
{
return !!member->flags[flag];
}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论