From: Travis Cross <tc@traviscross.com>
Date: Mon, 3 Mar 2014 20:03:22 +0000 (+0000)
Subject: Avoid repeating ourselves in generating silence
X-Git-Tag: v1.2.23~33^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6a10585bb53380868f41bc44df8d5f4e26a9564;p=thirdparty%2Ffreeswitch.git

Avoid repeating ourselves in generating silence

We were handling the "send silence but not comfort noise" case in both
silence_stream_file_read and switch_generate_sln_silence.  This
changes the former to rely on the latter.
---

diff --git a/src/mod/formats/mod_tone_stream/mod_tone_stream.c b/src/mod/formats/mod_tone_stream/mod_tone_stream.c
index 2aafff129f..3495d0578f 100644
--- a/src/mod/formats/mod_tone_stream/mod_tone_stream.c
+++ b/src/mod/formats/mod_tone_stream/mod_tone_stream.c
@@ -93,11 +93,8 @@ static switch_status_t silence_stream_file_read(switch_file_handle_t *handle, vo
 		sh->samples -= *len;
 	}
 
-	if (sh->silence) {
-		switch_generate_sln_silence((int16_t *) data, *len, sh->silence);
-	} else {
-		memset(data, 0, *len * 2);
-	}
+	switch_generate_sln_silence((int16_t *) data, *len,
+								sh->silence ? sh->silence : (uint32_t)-1);
 
 	return SWITCH_STATUS_SUCCESS;
 }