Change DTMF and MF level parameters to match country specs

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

1 files changed, 50 insertions, 50 deletions

diff --git a/zonedata.c b/zonedata.c
index 3962224..7889e70 100644
--- a/zonedata.c
+++ b/zonedata.c
@@ -86,9 +86,9 @@ struct tone_zone builtin_zones[] =
 			{ ZT_TONE_INFO, "!950/330,!1400/330,!1800/330,0" },
 			{ ZT_TONE_STUTTER, "!440/100,!0/100,!440/100,!0/100,!440/100,!0/100,!440/100,!0/100,!440/100,!0/100,!440/100,!0/100,440" },
 		},
-	  .dtmf_high_level = -10,
-	  .dtmf_low_level = -10,
-	  .mf_level = -10,
+	  .dtmf_high_level = -11,
+	  .dtmf_low_level = -9,
+	  .mf_level = -7,
 	},
 	{ .zone = 3,
 	  .country = "nl",
@@ -109,9 +109,9 @@ struct tone_zone builtin_zones[] =
 			{ ZT_TONE_INFO, "950/330,1400/330,1800/330,0/1000" },
 			{ ZT_TONE_STUTTER, "425/500,0/50" },
 		},
-	  .dtmf_high_level = -10,
-	  .dtmf_low_level = -10,
-	  .mf_level = -10,
+	  .dtmf_high_level = -11,
+	  .dtmf_low_level = -9,
+	  .mf_level = -7,
 	},
 	{ .zone = 4,
 	  .country = "uk",
@@ -129,9 +129,9 @@ struct tone_zone builtin_zones[] =
 			{ ZT_TONE_INFO, "950/330,0/15,1400/330,0/15,1800/330,0/1000" },
 			{ ZT_TONE_STUTTER, "350+440/750,440/750" },
 		},
-	  .dtmf_high_level = -10,
-	  .dtmf_low_level = -10,
-	  .mf_level = -10,
+	  .dtmf_high_level = -11,
+	  .dtmf_low_level = -13,
+	  .mf_level = -7,
 	},
 	{ .zone = 5,
 	  .country = "fi",
@@ -148,9 +148,9 @@ struct tone_zone builtin_zones[] =
 			{ ZT_TONE_INFO, "950/650,0/325,950/325,0/30,1400/1300,0/2600" },
 			{ ZT_TONE_STUTTER, "425/650,0/25" },
 		},
-	  .dtmf_high_level = -10,
-	  .dtmf_low_level = -10,
-	  .mf_level = -10,
+	  .dtmf_high_level = -11,
+	  .dtmf_low_level = -9,
+	  .mf_level = -7,
 	},
 	{ .zone = 6,
 	  .country = "es",
@@ -167,9 +167,9 @@ struct tone_zone builtin_zones[] =
 			{ ZT_TONE_INFO, "950/330,0/1000" },
 			{ ZT_TONE_STUTTER, "425/500,0/50" },
 		},
-	  .dtmf_high_level = -10,
-	  .dtmf_low_level = -10,
-	  .mf_level = -10,
+	  .dtmf_high_level = -11,
+	  .dtmf_low_level = -13,
+	  .mf_level = -7,
 	},
 	{ .zone = 7,
 	  .country = "jp",
@@ -186,9 +186,9 @@ struct tone_zone builtin_zones[] =
 			{ ZT_TONE_INFO, "!950/330,!1400/330,!1800/330,0" },
 			{ ZT_TONE_STUTTER, "!400/100,!0/100,!400/100,!0/100,!400/100,!0/100,!400/100,!0/100,!400/100,!0/100,!400/100,!0/100,400" },
 		},
-	  .dtmf_high_level = -10,
-	  .dtmf_low_level = -10,
-	  .mf_level = -10,
+	  .dtmf_high_level = -7,
+	  .dtmf_low_level = -7,
+	  .mf_level = -7,
 	},
 	{ .zone = 8,
 	  .country = "no",
@@ -245,9 +245,9 @@ struct tone_zone builtin_zones[] =
 			{ ZT_TONE_INFO, "400/750,0/100,400/750,0/100,400/750,0/100,400/750,0/400" },
 			{ ZT_TONE_STUTTER, "!400/100!0/100,!400/100,!0/100,!400/100,!0/100,!400/100!0/100,!400/100,!0/100,!400/100,!0/100,400" },
 		},
-	  .dtmf_high_level = -10,
-	  .dtmf_low_level = -10,
-	  .mf_level = -10,
+	  .dtmf_high_level = -11,
+	  .dtmf_low_level = -9,
+	  .mf_level = -7,
 	},
 	{ .zone = 11,
 	  .country = "it",
@@ -322,9 +322,9 @@ struct tone_zone builtin_zones[] =
 			{ ZT_TONE_INFO, "!950/330,!1400/330,!1800/330,0" },
 			{ ZT_TONE_STUTTER, "!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,350+440" },
 		},
-	  .dtmf_high_level = -10,
-	  .dtmf_low_level = -10,
-	  .mf_level = -10,
+	  .dtmf_high_level = -11,
+	  .dtmf_low_level = -9,
+	  .mf_level = -7,
 	},
 	{ .zone = 15,
 	  .country = "cl",
@@ -365,9 +365,9 @@ struct tone_zone builtin_zones[] =
 			/*{ ZT_TONE_STUTTER, "425/320,0/20" },              Real swedish standard, not used for now */
 			{ ZT_TONE_STUTTER, "!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,425" },
 		},
-	  .dtmf_high_level = -10,
+	  .dtmf_high_level = -9,
 	  .dtmf_low_level = -10,
-	  .mf_level = -10,
+	  .mf_level = -7,
 	},
 	{ .zone = 17,
 	  .country = "be",
@@ -409,9 +409,9 @@ struct tone_zone builtin_zones[] =
 			{ ZT_TONE_INFO,       "950/330,1400/330,1800/330,0/1000" },
 			{ ZT_TONE_STUTTER,    "!425/200,!0/200,!425/600,!0/200,!425/200,!0/200,!425/600,!0/200,!425/200,!0/200,!425/600,!0/200,!425/200,!0/200,!425/600,!0/200,425" },
 		},
-	  .dtmf_high_level = -10,
-	  .dtmf_low_level = -10,
-	  .mf_level = -10,
+	  .dtmf_high_level = -11,
+	  .dtmf_low_level = -9,
+	  .mf_level = -7,
 	},
 	{ .zone = 19,
 	  .country = "il",
@@ -535,9 +535,9 @@ struct tone_zone builtin_zones[] =
 			/* STUTTER not specified */
 			{ ZT_TONE_STUTTER, "!400*33/100,!0/100,!400*33/100,!0/100,!400*33/100,!0/100,!400*33/100,!0/100,!400*33/100,!0/100,!400*33/100,!0/100,400*33" },
 		},
-	  .dtmf_high_level = -10,
-	  .dtmf_low_level = -10,
-	  .mf_level = -10,
+	  .dtmf_high_level = -11,
+	  .dtmf_low_level = -13,
+	  .mf_level = -7,
 	},
 	{ .zone = 25,
 	  .country = "pt",
@@ -599,9 +599,9 @@ struct tone_zone builtin_zones[] =
 			{ ZT_TONE_INFO, "950/330,0/30,1400/330,0/30,1800/330,0/1000" },
 			{ ZT_TONE_STUTTER, "!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,350+440" },
 		},
-	  .dtmf_high_level = -10,
-	  .dtmf_low_level = -10,
-	  .mf_level = -10,
+	  .dtmf_high_level = -8,
+	  .dtmf_low_level = -6,
+	  .mf_level = -7,
 	},
 	{ .zone = 28,
 	  .country = "in",
@@ -645,9 +645,9 @@ struct tone_zone builtin_zones[] =
 			{ ZT_TONE_INFO, "950/330,1400/330,1800/330,0/1000" },
 			{ ZT_TONE_STUTTER, "425+400" },
 		},
-	  .dtmf_high_level = -10,
-	  .dtmf_low_level = -10,
-	  .mf_level = -10,
+	  .dtmf_high_level = -11,
+	  .dtmf_low_level = -9,
+	  .mf_level = -7,
 	},
 	{ .zone = 30,
 	  .country = "ch",
@@ -734,9 +734,9 @@ struct tone_zone builtin_zones[] =
 			/* STUTTER - not specified */
 			{ ZT_TONE_STUTTER, "450+425" },
 		},
-	  .dtmf_high_level = -10,
-	  .dtmf_low_level = -10,
-	  .mf_level = -10,
+	  .dtmf_high_level = -11,
+	  .dtmf_low_level = -9,
+	  .mf_level = -7,
 	},
 	{ .zone = 34,
 	  .country = "ar",
@@ -753,9 +753,9 @@ struct tone_zone builtin_zones[] =
 			{ ZT_TONE_INFO, "425/100,0/100" },
 			{ ZT_TONE_STUTTER, "425/450,0/50" },
 		},
-	  .dtmf_high_level = -10,
-	  .dtmf_low_level = -10,
-	  .mf_level = -10,
+	  .dtmf_high_level = -11,
+	  .dtmf_low_level = -9,
+	  .mf_level = -7,
 	},
 	{ .zone = 35,
 	  .country = "my",
@@ -796,9 +796,9 @@ struct tone_zone builtin_zones[] =
 			/* STUTTER - not specified */
 			{ ZT_TONE_STUTTER,    "!400/200,!0/200,!400/600,!0/200,!400/200,!0/200,!400/600,!0/200,!400/200,!0/200,!400/600,!0/200,!400/200,!0/200,!400/600,!0/200,400" },
 		},
-	  .dtmf_high_level = -10,
-	  .dtmf_low_level = -10,
-	  .mf_level = -10,
+	  .dtmf_high_level = -11,
+	  .dtmf_low_level = -9,
+	  .mf_level = -7,
 	},
 	{ .zone = 37,
 	  .country = "bg",
@@ -837,9 +837,9 @@ struct tone_zone builtin_zones[] =
 			/* STUTTER - not specified */
 			{ ZT_TONE_STUTTER, "!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,425" },
 		},
-	  .dtmf_high_level = -10,
-	  .dtmf_low_level = -10,
-	  .mf_level = -10,
+	  .dtmf_high_level = -7,
+	  .dtmf_low_level = -9,
+	  .mf_level = -7,
         },
         { .zone = 39,
 	  .country = "ph",