]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Avoiding NitPick MODAPP_155
authorAnthony Minessale <anthony.minessale@gmail.com>
Tue, 14 Oct 2008 19:39:35 +0000 (19:39 +0000)
committerAnthony Minessale <anthony.minessale@gmail.com>
Tue, 14 Oct 2008 19:39:35 +0000 (19:39 +0000)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@10015 d0543943-73ff-0310-b7d9-9358b9ac24b2

src/mod/applications/mod_conference/mod_conference.c

index d2e1602c0c1159849f2bdcb34ddc32c3ab534635..6e418ae11c5dc45dc52d6e41196341919866da7d 100644 (file)
@@ -618,8 +618,8 @@ static switch_status_t conference_add_member(conference_obj_t *conference, confe
                                        conference_member_say(member, msg, CONF_DEFAULT_LEADIN);
                                } else if (conference->count == 1 && !conference->perpetual_sound) {
                                        if (conference->alone_sound) {
-                                               conference_play_file(conference, conference->alone_sound, CONF_DEFAULT_LEADIN, switch_core_session_get_channel(member->session),
-                                                                                        0);
+                                               conference_stop_file(conference, FILE_STOP_ASYNC);
+                                               conference_play_file(conference, conference->alone_sound, CONF_DEFAULT_LEADIN, switch_core_session_get_channel(member->session), 1);
                                        } else {
                                                switch_snprintf(msg, sizeof(msg), "You are currently the only person in this conference.");
                                                conference_member_say(member, msg, CONF_DEFAULT_LEADIN);
@@ -743,7 +743,8 @@ static switch_status_t conference_del_member(conference_obj_t *conference, confe
                                conference_play_file(conference, conference->exit_sound, 0, switch_core_session_get_channel(member->session), 0);
                        }
                        if (conference->count == 1 && conference->alone_sound) {
-                               conference_play_file(conference, conference->alone_sound, 0, switch_core_session_get_channel(member->session), 0);
+                               conference_stop_file(conference, FILE_STOP_ASYNC);
+                               conference_play_file(conference, conference->alone_sound, 0, switch_core_session_get_channel(member->session), 1);
                        }
                }