[svn-commits] rmudgett: branch 12 r410491 - in /branches/12: ./ apps/confbridge/

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Wed Mar 12 13:45:54 2014
New Revision: 410491

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=410491
Log:
app_confbridge: Make explicitly stop MOH if a user is kicked or hangs up while MOH is playing.

When MOH is playing to a user in a conference and the user is kicked or
hangs up from the conference then the AMI MusicOnHoldStop events didn't
happen.  (Asterisk v11 AMI event: MusicOnHold, state:Stop)

(closes issue ASTERISK-23311)
Reported by: Benjamin Keith Ford

Review: https://reviewboard.asterisk.org/r/3306/
........

Merged revisions 410490 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    branches/12/   (props changed)
    branches/12/apps/confbridge/conf_state.c
    branches/12/apps/confbridge/conf_state_inactive.c
    branches/12/apps/confbridge/conf_state_single.c
    branches/12/apps/confbridge/conf_state_single_marked.c

Propchange: branches/12/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: branches/12/apps/confbridge/conf_state.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/apps/confbridge/conf_state.c?view=diff&rev=410491&r1=410490&r2=410491
==============================================================================
--- branches/12/apps/confbridge/conf_state.c (original)
+++ branches/12/apps/confbridge/conf_state.c Wed Mar 12 13:45:54 2014
@@ -74,6 +74,9 @@
 void conf_default_leave_waitmarked(struct confbridge_user *user)
 {
 	conf_remove_user_waiting(user->conference, user);
+	if (user->playing_moh) {
+		conf_moh_stop(user);
+	}
 }
 
 void conf_change_state(struct confbridge_user *user, struct confbridge_state *newstate)

Modified: branches/12/apps/confbridge/conf_state_inactive.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/apps/confbridge/conf_state_inactive.c?view=diff&rev=410491&r1=410490&r2=410491
==============================================================================
--- branches/12/apps/confbridge/conf_state_inactive.c (original)
+++ branches/12/apps/confbridge/conf_state_inactive.c Wed Mar 12 13:45:54 2014
@@ -66,7 +66,7 @@
 
 static void leave_waitmarked(struct confbridge_user *user)
 {
-	conf_remove_user_waiting(user->conference, user);
+	conf_default_leave_waitmarked(user);
 	if (user->conference->waitingusers == 0) {
 		conf_change_state(user, CONF_STATE_EMPTY);
 	}

Modified: branches/12/apps/confbridge/conf_state_single.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/apps/confbridge/conf_state_single.c?view=diff&rev=410491&r1=410490&r2=410491
==============================================================================
--- branches/12/apps/confbridge/conf_state_single.c (original)
+++ branches/12/apps/confbridge/conf_state_single.c Wed Mar 12 13:45:54 2014
@@ -72,6 +72,9 @@
 static void leave_unmarked(struct confbridge_user *user)
 {
 	conf_remove_user_active(user->conference, user);
+	if (user->playing_moh) {
+		conf_moh_stop(user);
+	}
 
 	if (user->conference->waitingusers) {
 		conf_change_state(user, CONF_STATE_INACTIVE);

Modified: branches/12/apps/confbridge/conf_state_single_marked.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/apps/confbridge/conf_state_single_marked.c?view=diff&rev=410491&r1=410490&r2=410491
==============================================================================
--- branches/12/apps/confbridge/conf_state_single_marked.c (original)
+++ branches/12/apps/confbridge/conf_state_single_marked.c Wed Mar 12 13:45:54 2014
@@ -71,6 +71,9 @@
 static void leave_marked(struct confbridge_user *user)
 {
 	conf_remove_user_marked(user->conference, user);
+	if (user->playing_moh) {
+		conf_moh_stop(user);
+	}
 
 	conf_change_state(user, CONF_STATE_EMPTY);
 }