From: Matt Jordan <mjordan@digium.com>
Date: Tue, 6 Sep 2016 20:25:28 +0000 (-0500)
Subject: res/res_stasis_playback: Cancel the entire playlist when a stop occurs
X-Git-Tag: 14.1.0-rc1~67^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=827b235357782d5f3be62092c405af368f28180b;p=thirdparty%2Fasterisk.git

res/res_stasis_playback: Cancel the entire playlist when a stop occurs

Prior to this patch, a stop issued by a delete of a Playback resource
(indicated by the control frame AST_CONTROL_STREAM_STOP) would only stop
the current media URI playing. Subsequent URIs specified by a playback
operation would then proceed on, even though we had just indicated to
the User that the Playback was finished *and* after they had just
'deleted' the resource. Whoops.

This patch corrects it by bailing out of the sequence of URIs to play if
one of them is terminated with an AST_CONTROL_STREAM_STOP indication.

ASTERISK-26341 #close

Change-Id: I2da9ec43545ba46cdfffe287c7e4907eae7fca42
---

diff --git a/res/res_stasis_playback.c b/res/res_stasis_playback.c
index a64ecffa70..cfddb3af56 100644
--- a/res/res_stasis_playback.c
+++ b/res/res_stasis_playback.c
@@ -370,6 +370,9 @@ static void play_on_channel(struct stasis_app_playback *playback,
 
 		playback_final_update(playback, offsetms, res,
 			ast_channel_uniqueid(chan));
+		if (res == AST_CONTROL_STREAM_STOP) {
+			break;
+		}
 
 		/* Reset offset for any subsequent media */
 		offsetms = 0;