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 9005f5ee8b09f692631f3b5a337147a7d20c9b5e..3c6e69ac8e3a7477daed5e23f2d7b2ccc3dfc639 100644 (file)
--- 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 -= (int32_t)*len;
        }
 
-       if (sh->silence) {
-               switch_generate_sln_silence((int16_t *) data, (uint32_t)*len, sh->silence);
-       } else {
-               memset(data, 0, *len * 2);
-       }
+       switch_generate_sln_silence((int16_t *) data, (uint32_t)*len,
+                                                               sh->silence ? sh->silence : (uint32_t)-1);
 
        return SWITCH_STATUS_SUCCESS;
 }