kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-7513: remove locking

This commit is contained in:
Anthony Minessale 2015-02-06 18:14:12 -06:00 committed by Michael Jerris
parent 1deca68e37
commit c9e0a389bd
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mod/applications/mod_conference/mod_conference.c
View File

@ -288,6 +288,7 @@ typedef enum {
#ifdef OPENAL_POSITIONING #ifdef OPENAL_POSITIONING
typedef struct al_handle_s { typedef struct al_handle_s {
switch_mutex_t *mutex;
ALCdevice *device; ALCdevice *device;
ALCcontext *context; ALCcontext *context;
ALuint source; ALuint source;
@ -1564,6 +1565,7 @@ static al_handle_t *create_al(switch_memory_pool_t *pool)
al_handle_t *al; al_handle_t *al;
al = switch_core_alloc(pool, sizeof(al_handle_t)); al = switch_core_alloc(pool, sizeof(al_handle_t));
switch_mutex_init(&al->mutex, SWITCH_MUTEX_NESTED, pool);
return al; return al;
} }
@ -1601,6 +1603,7 @@ static void gen_arc(conference_obj_t *conference, switch_stream_handle_t *stream
if (count < 3) { if (count < 3) {
for (member = conference->members; member; member = member->next) { for (member = conference->members; member; member = member->next) {
if (member->channel && !switch_test_flag(member, MFLAG_NO_POSITIONAL) && member->al) { if (member->channel && !switch_test_flag(member, MFLAG_NO_POSITIONAL) && member->al) {
member->al->pos_x = 0; member->al->pos_x = 0;
member->al->pos_y = 0; member->al->pos_y = 0;
member->al->pos_z = 0; member->al->pos_z = 0;
@ -3130,11 +3133,11 @@ static switch_status_t member_parse_position(conference_member_t *member, const
#else #else
static switch_status_t member_parse_position(conference_member_t *member, const char *data) static switch_status_t member_parse_position(conference_member_t *member, const char *data)
{ {
switch_status_t status; switch_status_t status = SWITCH_STATUS_FALSE;
lock_member(member); if (member->al) {
status = parse_position(member->al, data); status = parse_position(member->al, data);
unlock_member(member); }
return status; return status;