[svn-commits] mogorman: branch 1.2 r48394 - in /branches/1.2: ./ apps/

[svn-commits at lists.digium.com]

Author: mogorman
Date: Mon Dec 11 15:55:43 2006
New Revision: 48394

URL: http://svn.digium.com/view/asterisk?view=rev&rev=48394
Log:
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.

Modified:
    branches/1.2/Makefile
    branches/1.2/apps/app_externalivr.c
    branches/1.2/sounds.txt

Modified: branches/1.2/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.2/Makefile?view=diff&rev=48394&r1=48393&r2=48394
==============================================================================
--- branches/1.2/Makefile (original)
+++ branches/1.2/Makefile Mon Dec 11 15:55:43 2006
@@ -553,10 +553,19 @@
 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 \
 			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits ; \
+		else \
+			echo "No description for $$x"; \
+			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; \

Modified: branches/1.2/apps/app_externalivr.c
URL: http://svn.digium.com/view/asterisk/branches/1.2/apps/app_externalivr.c?view=diff&rev=48394&r1=48393&r2=48394
==============================================================================
--- branches/1.2/apps/app_externalivr.c (original)
+++ branches/1.2/apps/app_externalivr.c Mon Dec 11 15:55:43 2006
@@ -153,7 +153,7 @@
 		if (state->current) {
 			file_to_stream = state->current->filename;
 		} else {
-			file_to_stream = "silence-10";
+			file_to_stream = "silence/10";
 			u->playing_silence = 1;
 		}
 

Modified: branches/1.2/sounds.txt
URL: http://svn.digium.com/view/asterisk/branches/1.2/sounds.txt?view=diff&rev=48394&r1=48393&r2=48394
==============================================================================
--- branches/1.2/sounds.txt (original)
+++ branches/1.2/sounds.txt Mon Dec 11 15:55:43 2006
@@ -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
+