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, 2 insertions, 1 deletions

diff --git a/tonezone.h b/tonezone.h
index f59940e..ca795f6 100644
--- a/tonezone.h
+++ b/tonezone.h
@@ -50,7 +50,8 @@ struct tone_zone {
 						   of DTMF, expressed in dBm0. */
 	int dtmf_low_level;			/* Power level of low frequency component
 						   of DTMF, expressed in dBm0. */
-	int mf_level;				/* Power level of MF, expressed in dBm0. */
+	int mfr1_level;				/* Power level of MFR1, expressed in dBm0. */
+	int mfr2_level;				/* Power level of MFR2, expressed in dBm0. */
 };
 
 extern struct tone_zone builtin_zones[];