Added support for modulation (not just two tone addition) in tonezones

git-svn-id: http://svn.digium.com/svn/zaptel/trunk@313 5390a7c7-147a-4af0-8ec9-7488f05a26cb

1 files changed, 13 insertions, 2 deletions

diff --git a/zonedata.c b/zonedata.c
index 274dc60..e7404e2 100755
--- a/zonedata.c
+++ b/zonedata.c
@@ -40,8 +40,7 @@ struct tone_zone builtin_zones[]  =
 	},
 	{ 1, "au", "Australia", {  400, 200, 400, 2000 },
 	{
-		/* XXX Dialtone: Should be modulated, not added XXX */
-		{ ZT_TONE_DIALTONE, "425+25" },		
+		{ ZT_TONE_DIALTONE, "425*25" },		
 		{ ZT_TONE_BUSY, "400/375,0/375" },
 		{ ZT_TONE_RINGTONE, "400+17/400,0/200,400+17/400,0/2000" },
 		/* XXX Congestion: Should reduce by 10 db every other cadence XXX */
@@ -183,6 +182,18 @@ struct tone_zone builtin_zones[]  =
 		{ ZT_TONE_INFO, "!950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,0" },
 		{ ZT_TONE_STUTTER, "470/400,425/400" } },
 	},
+	{ 12, "us-old", "United States Circa 1950/ North America", { 2000, 4000 }, 
+	{
+		{ ZT_TONE_DIALTONE, "600*120" },
+		{ ZT_TONE_BUSY, "500*100/500,0/500" },
+		{ ZT_TONE_RINGTONE, "420*40/2000,0/4000" },
+		{ ZT_TONE_CONGESTION, "500*100/250,0/250" },
+		{ ZT_TONE_CALLWAIT, "440/300,0/10000" },
+		{ ZT_TONE_DIALRECALL, "!600*120/100,!0/100,!600*120/100,!0/100,!600*120/100,!0/100,600*120" },
+		{ ZT_TONE_RECORDTONE, "1400/500,0/15000" },
+		{ ZT_TONE_INFO, "!950/330,!1400/330,!1800/330,0" },
+		{ ZT_TONE_STUTTER, "!600*120/100,!0/100,!600*120/100,!0/100,!600*120/100,!0/100,!600*120/100,!0/100,!600*120/100,!0/100,!600*120/100,!0/100,600*120" } },
+	},
 	{ -1 }		
 };