[Asterisk-code-review] res musiconhold: Don't restart MOH from beginning after anno... (asterisk[15])

[Jenkins2]

Jenkins2 has submitted this change and it was merged. ( https://gerrit.asterisk.org/8776 )

Change subject: res_musiconhold: Don't restart MOH from beginning after announcement.
......................................................................

res_musiconhold: Don't restart MOH from beginning after announcement.

This reverts a problem introduced by the fix for ASTERISK_24329.
Now, when an announcement is played while waiting in a queue, music on
hold will not restart from the beginning of the sound file and will
instead pick up where it left off. However, the incorrect behavior in
ASTERISK_24329 is now present again; if an announcement X seconds
long is played when music on hold starts, music on hold will start X
seconds into the file.

ASTERISK-27774 #close
Reported by: lvl

Change-Id: I86b2885ee7063268f9b9747eddb788336ade989b
---
M res/res_musiconhold.c
1 file changed, 0 insertions(+), 1 deletion(-)

Approvals:
  Richard Mudgett: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved
  Jenkins2: Approved for Submit



diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index 55b14c9..1c8728c 100644
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -333,7 +333,6 @@
 		}
 	} else {
 		state->announcement = 0;
-		state->samples = 0;
 	}
 
 	if (!state->class->total_files) {

-- 
To view, visit https://gerrit.asterisk.org/8776
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: 15
Gerrit-MessageType: merged
Gerrit-Change-Id: I86b2885ee7063268f9b9747eddb788336ade989b
Gerrit-Change-Number: 8776
Gerrit-PatchSet: 3
Gerrit-Owner: Benjamin Keith Ford <bford at digium.com>
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Richard Mudgett <rmudgett at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20180417/0f10ac1e/attachment.html>