add MF R2 tone generation, and along the way do a lot of cleanup of the tone building and playback code

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

1 files changed, 82 insertions, 41 deletions

diff --git a/zonedata.c b/zonedata.c
index 7889e70..7cb2938 100644
--- a/zonedata.c
+++ b/zonedata.c
@@ -44,7 +44,8 @@ struct tone_zone builtin_zones[] =
 		},
 	  .dtmf_high_level = -10,
 	  .dtmf_low_level = -10,
-	  .mf_level = -10,
+	  .mfr1_level = -10,
+	  .mfr2_level = -8,
 	},
 	{ .zone = 1,
 	  .country = "au",
@@ -64,7 +65,8 @@ struct tone_zone builtin_zones[] =
 		},
 	  .dtmf_high_level = -10,
 	  .dtmf_low_level = -10,
-	  .mf_level = -10,
+	  .mfr1_level = -10,
+	  .mfr2_level = -8,
 	},
 	{ .zone = 2,
 	  .country = "fr",
@@ -88,7 +90,8 @@ struct tone_zone builtin_zones[] =
 		},
 	  .dtmf_high_level = -11,
 	  .dtmf_low_level = -9,
-	  .mf_level = -7,
+	  .mfr1_level = -7,
+	  .mfr2_level = -8,
 	},
 	{ .zone = 3,
 	  .country = "nl",
@@ -111,7 +114,8 @@ struct tone_zone builtin_zones[] =
 		},
 	  .dtmf_high_level = -11,
 	  .dtmf_low_level = -9,
-	  .mf_level = -7,
+	  .mfr1_level = -7,
+	  .mfr2_level = -8,
 	},
 	{ .zone = 4,
 	  .country = "uk",
@@ -131,7 +135,8 @@ struct tone_zone builtin_zones[] =
 		},
 	  .dtmf_high_level = -11,
 	  .dtmf_low_level = -13,
-	  .mf_level = -7,
+	  .mfr1_level = -7,
+	  .mfr2_level = -8,
 	},
 	{ .zone = 5,
 	  .country = "fi",
@@ -150,7 +155,8 @@ struct tone_zone builtin_zones[] =
 		},
 	  .dtmf_high_level = -11,
 	  .dtmf_low_level = -9,
-	  .mf_level = -7,
+	  .mfr1_level = -7,
+	  .mfr2_level = -8,
 	},
 	{ .zone = 6,
 	  .country = "es",
@@ -169,7 +175,8 @@ struct tone_zone builtin_zones[] =
 		},
 	  .dtmf_high_level = -11,
 	  .dtmf_low_level = -13,
-	  .mf_level = -7,
+	  .mfr1_level = -7,
+	  .mfr2_level = -8,
 	},
 	{ .zone = 7,
 	  .country = "jp",
@@ -188,7 +195,8 @@ struct tone_zone builtin_zones[] =
 		},
 	  .dtmf_high_level = -7,
 	  .dtmf_low_level = -7,
-	  .mf_level = -7,
+	  .mfr1_level = -7,
+	  .mfr2_level = -8,
 	},
 	{ .zone = 8,
 	  .country = "no",
@@ -207,7 +215,8 @@ struct tone_zone builtin_zones[] =
 		},
 	  .dtmf_high_level = -10,
 	  .dtmf_low_level = -10,
-	  .mf_level = -10,
+	  .mfr1_level = -10,
+	  .mfr2_level = -8,
 	},
 	{ .zone = 9,
 	  .country =  "at",
@@ -228,7 +237,8 @@ struct tone_zone builtin_zones[] =
 		},
 	  .dtmf_high_level = -10,
 	  .dtmf_low_level = -10,
-	  .mf_level = -10,
+	  .mfr1_level = -10,
+	  .mfr2_level = -8,
 	},
 	{ .zone = 10,
 	  .country =  "nz",
@@ -247,7 +257,8 @@ struct tone_zone builtin_zones[] =
 		},
 	  .dtmf_high_level = -11,
 	  .dtmf_low_level = -9,
-	  .mf_level = -7,
+	  .mfr1_level = -7,
+	  .mfr2_level = -8,
 	},
 	{ .zone = 11,
 	  .country = "it",
@@ -267,7 +278,8 @@ struct tone_zone builtin_zones[] =
 		},
 	  .dtmf_high_level = -10,
 	  .dtmf_low_level = -10,
-	  .mf_level = -10,
+	  .mfr1_level = -10,
+	  .mfr2_level = -8,
 	},
 	{ .zone = 12,
 	  .country = "us-old",
@@ -286,7 +298,8 @@ struct tone_zone builtin_zones[] =
 		},
 	  .dtmf_high_level = -10,
 	  .dtmf_low_level = -10,
-	  .mf_level = -10,
+	  .mfr1_level = -10,
+	  .mfr2_level = -8,
 	},
 	{ .zone = 13,
 	  .country = "gr",
@@ -305,7 +318,8 @@ struct tone_zone builtin_zones[] =
 		},
 	  .dtmf_high_level = -10,
 	  .dtmf_low_level = -10,
-	  .mf_level = -10,
+	  .mfr1_level = -10,
+	  .mfr2_level = -8,
 	},
 	{ .zone = 14,
 	  .country = "tw",
@@ -324,7 +338,8 @@ struct tone_zone builtin_zones[] =
 		},
 	  .dtmf_high_level = -11,
 	  .dtmf_low_level = -9,
-	  .mf_level = -7,
+	  .mfr1_level = -7,
+	  .mfr2_level = -8,
 	},
 	{ .zone = 15,
 	  .country = "cl",
@@ -343,7 +358,8 @@ struct tone_zone builtin_zones[] =
 		},
 	  .dtmf_high_level = -10,
 	  .dtmf_low_level = -10,
-	  .mf_level = -10,
+	  .mfr1_level = -10,
+	  .mfr2_level = -8,
 	},
 	{ .zone = 16,
 	  .country = "se",
@@ -367,7 +383,8 @@ struct tone_zone builtin_zones[] =
 		},
 	  .dtmf_high_level = -9,
 	  .dtmf_low_level = -10,
-	  .mf_level = -7,
+	  .mfr1_level = -7,
+	  .mfr2_level = -8,
 	},
 	{ .zone = 17,
 	  .country = "be",
@@ -389,7 +406,8 @@ struct tone_zone builtin_zones[] =
 		},
 	  .dtmf_high_level = -10,
 	  .dtmf_low_level = -10,
-	  .mf_level = -10,
+	  .mfr1_level = -10,
+	  .mfr2_level = -8,
 	},
 	{ .zone = 18,
 	  .country = "sg",
@@ -411,7 +429,8 @@ struct tone_zone builtin_zones[] =
 		},
 	  .dtmf_high_level = -11,
 	  .dtmf_low_level = -9,
-	  .mf_level = -7,
+	  .mfr1_level = -7,
+	  .mfr2_level = -8,
 	},
 	{ .zone = 19,
 	  .country = "il",
@@ -430,7 +449,8 @@ struct tone_zone builtin_zones[] =
 		},
 	  .dtmf_high_level = -10,
 	  .dtmf_low_level = -10,
-	  .mf_level = -10,
+	  .mfr1_level = -10,
+	  .mfr2_level = -8,
 	},
 	{ .zone = 20,
 	  .country = "br",
@@ -448,7 +468,8 @@ struct tone_zone builtin_zones[] =
 			{ ZT_TONE_STUTTER, "350+440" } },
 	  .dtmf_high_level = -10,
 	  .dtmf_low_level = -12,
-	  .mf_level = -10,
+	  .mfr1_level = -10,
+	  .mfr2_level = -8,
 	},
 	{ .zone = 21,
 	  .country = "hu",
@@ -469,7 +490,8 @@ struct tone_zone builtin_zones[] =
 		},
 	  .dtmf_high_level = -10,
 	  .dtmf_low_level = -10,
-	  .mf_level = -10,
+	  .mfr1_level = -10,
+	  .mfr2_level = -8,
 	},
 	{ .zone = 22,
 	  .country = "lt",
@@ -492,7 +514,8 @@ struct tone_zone builtin_zones[] =
 		},
 	  .dtmf_high_level = -10,
 	  .dtmf_low_level = -10,
-	  .mf_level = -10,
+	  .mfr1_level = -10,
+	  .mfr2_level = -8,
 	},
 	{ .zone = 23,
 	  .country = "pl",
@@ -515,7 +538,8 @@ struct tone_zone builtin_zones[] =
 		},
 	  .dtmf_high_level = -10,
 	  .dtmf_low_level = -10,
-	  .mf_level = -10,
+	  .mfr1_level = -10,
+	  .mfr2_level = -8,
 	},
 	{ .zone = 24,
 	  .country = "za",
@@ -537,7 +561,8 @@ struct tone_zone builtin_zones[] =
 		},
 	  .dtmf_high_level = -11,
 	  .dtmf_low_level = -13,
-	  .mf_level = -7,
+	  .mfr1_level = -7,
+	  .mfr2_level = -8,
 	},
 	{ .zone = 25,
 	  .country = "pt",
@@ -559,7 +584,8 @@ struct tone_zone builtin_zones[] =
 		},
 	  .dtmf_high_level = -10,
 	  .dtmf_low_level = -10,
-	  .mf_level = -10,
+	  .mfr1_level = -10,
+	  .mfr2_level = -8,
 	},
 	{ .zone = 26,
 	  .country = "ee",
@@ -582,7 +608,8 @@ struct tone_zone builtin_zones[] =
 		},
 	  .dtmf_high_level = -10,
 	  .dtmf_low_level = -10,
-	  .mf_level = -10,
+	  .mfr1_level = -10,
+	  .mfr2_level = -8,
 	},
 	{ .zone = 27,
 	  .country = "mx",
@@ -601,7 +628,8 @@ struct tone_zone builtin_zones[] =
 		},
 	  .dtmf_high_level = -8,
 	  .dtmf_low_level = -6,
-	  .mf_level = -7,
+	  .mfr1_level = -7,
+	  .mfr2_level = -8,
 	},
 	{ .zone = 28,
 	  .country = "in",
@@ -625,7 +653,8 @@ struct tone_zone builtin_zones[] =
 		},
 	  .dtmf_high_level = -10,
 	  .dtmf_low_level = -10,
-	  .mf_level = -10,
+	  .mfr1_level = -10,
+	  .mfr2_level = -8,
 	},
 	{ .zone = 29,
 	  .country = "de",
@@ -647,7 +676,8 @@ struct tone_zone builtin_zones[] =
 		},
 	  .dtmf_high_level = -11,
 	  .dtmf_low_level = -9,
-	  .mf_level = -7,
+	  .mfr1_level = -7,
+	  .mfr2_level = -8,
 	},
 	{ .zone = 30,
 	  .country = "ch",
@@ -669,7 +699,8 @@ struct tone_zone builtin_zones[] =
 		},
 	  .dtmf_high_level = -10,
 	  .dtmf_low_level = -10,
-	  .mf_level = -10,
+	  .mfr1_level = -10,
+	  .mfr2_level = -8,
 	},
 	{ .zone = 31,
 	  .country = "dk",
@@ -692,7 +723,8 @@ struct tone_zone builtin_zones[] =
 		},
 	  .dtmf_high_level = -10,
 	  .dtmf_low_level = -10,
-	  .mf_level = -10,
+	  .mfr1_level = -10,
+	  .mfr2_level = -8,
 	},
 	{ .zone = 32,
 	  .country = "cz",
@@ -715,7 +747,8 @@ struct tone_zone builtin_zones[] =
 		},
 	  .dtmf_high_level = -10,
 	  .dtmf_low_level = -10,
-	  .mf_level = -10,
+	  .mfr1_level = -10,
+	  .mfr2_level = -8,
 	},
 	{ .zone = 33,
 	  .country = "cn",
@@ -736,7 +769,8 @@ struct tone_zone builtin_zones[] =
 		},
 	  .dtmf_high_level = -11,
 	  .dtmf_low_level = -9,
-	  .mf_level = -7,
+	  .mfr1_level = -7,
+	  .mfr2_level = -8,
 	},
 	{ .zone = 34,
 	  .country = "ar",
@@ -755,7 +789,8 @@ struct tone_zone builtin_zones[] =
 		},
 	  .dtmf_high_level = -11,
 	  .dtmf_low_level = -9,
-	  .mf_level = -7,
+	  .mfr1_level = -7,
+	  .mfr2_level = -8,
 	},
 	{ .zone = 35,
 	  .country = "my",
@@ -774,7 +809,8 @@ struct tone_zone builtin_zones[] =
 		},
 	  .dtmf_high_level = -10,
 	  .dtmf_low_level = -10,
-	  .mf_level = -10,
+	  .mfr1_level = -10,
+	  .mfr2_level = -8,
 	},
 	{ .zone = 36,
 	  .country = "th",
@@ -798,7 +834,8 @@ struct tone_zone builtin_zones[] =
 		},
 	  .dtmf_high_level = -11,
 	  .dtmf_low_level = -9,
-	  .mf_level = -7,
+	  .mfr1_level = -7,
+	  .mfr2_level = -8,
 	},
 	{ .zone = 37,
 	  .country = "bg",
@@ -818,7 +855,8 @@ struct tone_zone builtin_zones[] =
 		},
 	  .dtmf_high_level = -10,
 	  .dtmf_low_level = -10,
-	  .mf_level = -10,
+	  .mfr1_level = -10,
+	  .mfr2_level = -8,
 	},
         { .zone = 38,
 	  .country = "ve",
@@ -839,7 +877,8 @@ struct tone_zone builtin_zones[] =
 		},
 	  .dtmf_high_level = -7,
 	  .dtmf_low_level = -9,
-	  .mf_level = -7,
+	  .mfr1_level = -7,
+	  .mfr2_level = -8,
         },
         { .zone = 39,
 	  .country = "ph",
@@ -863,7 +902,8 @@ struct tone_zone builtin_zones[] =
 		},
 	  .dtmf_high_level = -10,
 	  .dtmf_low_level = -10,
-	  .mf_level = -10,
+	  .mfr1_level = -10,
+	  .mfr2_level = -8,
         },
 	{ .zone = 40,
 	  .country = "ru",
@@ -884,7 +924,8 @@ struct tone_zone builtin_zones[] =
 		},
 	  .dtmf_high_level = -10,
 	  .dtmf_low_level = -10,
-	  .mf_level = -10,
+	  .mfr1_level = -10,
+	  .mfr2_level = -8,
 	},
 	{ .zone = -1 }
 };