app_externalivr needs a real silence file, and additional

changes to add silence files into core instead of extra
patch provided by bug 8177 with minor additions.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@48394 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/Makefile b/Makefile
index 1521b60dc55364623b43eb8702c061dc4e8f5ad4..921d76810d93143622c098a3e0fc719fe4ec6118 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -553,6 +553,7 @@ clean:
 datafiles: all
        if [ x`$(ID) -un` = xroot ]; then sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
        mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
+       mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/silence
        mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros
        for x in sounds/digits/*.gsm; do \
                if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
@@ -562,6 +563,14 @@ datafiles: all
                        exit 1; \
                fi; \
        done
+       for x in sounds/silence/*.gsm; do \
+               if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
+                       $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/silence ; \
+               else \
+                       echo "No description for $$x"; \
+                       exit 1; \
+               fi; \
+       done
        mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate
        for x in sounds/dictate/*.gsm; do \
                if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \

diff --git a/apps/app_externalivr.c b/apps/app_externalivr.c
index 068463cec1c3e76b1f346eb2fbd9db2558299a40..1d4a6f3fde9b797cbf4c0132d22d35af1322fc12 100644 (file)
--- a/apps/app_externalivr.c
+++ b/apps/app_externalivr.c
@@ -153,7 +153,7 @@ static int gen_nextfile(struct gen_state *state)
                if (state->current) {
                        file_to_stream = state->current->filename;
                } else {
-                       file_to_stream = "silence-10";
+                       file_to_stream = "silence/10";
                        u->playing_silence = 1;
                }
 

diff --git a/sounds.txt b/sounds.txt
index c323ffbe6aa8607f07e20c948db76dc6c6d80f64..2dfd0bba7bb5ec1b47e13b712c1a067a8f8cdff5 100644 (file)
--- a/sounds.txt
+++ b/sounds.txt
@@ -728,3 +728,25 @@
 
 %spy-zap.gsm%Zap
 
+; Silence directory
+
+%1.gsm%1 seconds of silence
+
+%2.gsm%2 seconds of silence
+
+%3.gsm%3 seconds of silence
+
+%4.gsm%4 seconds of silence
+
+%5.gsm%5 seconds of silence
+
+%6.gsm%6 seconds of silence
+
+%7.gsm%7 seconds of silence
+
+%8.gsm%8 seconds of silence
+
+%9.gsm%9 seconds of silence
+
+%10.gsm%10 seconds of silence
+