Version 0.1.4 from FTP

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

1 files changed, 4 insertions, 51 deletions

diff --git a/digits.h b/digits.h
index 227f4b7..61e657c 100755
--- a/digits.h
+++ b/digits.h
@@ -20,69 +20,22 @@
 #ifndef _DIGITS_H
 #define _DIGITS_H
 
-#include "tones.h"
-
 #define DEFAULT_DTMF_LENGTH	100 * 8
 #define DEFAULT_MFV1_LENGTH	60 * 8
 #define	PAUSE_LENGTH		500 * 8
 
-static unsigned char silence[40] = 
-{ 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 
-  0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 
-  0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 
-  0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 
-  0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f };
-
 /* At the end of silence, the tone stops */
 static struct zt_tone dtmf_silence =
-	{ silence, sizeof(silence), DEFAULT_DTMF_LENGTH, NULL };
+	{ 0, 0, 0, 0, 0, 0, DEFAULT_DTMF_LENGTH, NULL };
 
 /* At the end of silence, the tone stops */
 static struct zt_tone mfv1_silence =
-	{ silence, sizeof(silence), DEFAULT_MFV1_LENGTH, NULL };
+	{ 0, 0, 0, 0, 0, 0, DEFAULT_MFV1_LENGTH, NULL };
 
 /* A pause in the dialing */
 static struct zt_tone tone_pause =
-	{ silence, sizeof(silence), PAUSE_LENGTH, NULL };
-
-static struct zt_tone dtmf_tones[16] = 
-{
-	{ dtmf_0, sizeof(dtmf_0), DEFAULT_DTMF_LENGTH, &dtmf_silence },
-	{ dtmf_1, sizeof(dtmf_1), DEFAULT_DTMF_LENGTH, &dtmf_silence },
-	{ dtmf_2, sizeof(dtmf_2), DEFAULT_DTMF_LENGTH, &dtmf_silence },
-	{ dtmf_3, sizeof(dtmf_3), DEFAULT_DTMF_LENGTH, &dtmf_silence },
-	{ dtmf_4, sizeof(dtmf_4), DEFAULT_DTMF_LENGTH, &dtmf_silence },
-	{ dtmf_5, sizeof(dtmf_5), DEFAULT_DTMF_LENGTH, &dtmf_silence },
-	{ dtmf_6, sizeof(dtmf_6), DEFAULT_DTMF_LENGTH, &dtmf_silence },
-	{ dtmf_7, sizeof(dtmf_7), DEFAULT_DTMF_LENGTH, &dtmf_silence },
-	{ dtmf_8, sizeof(dtmf_8), DEFAULT_DTMF_LENGTH, &dtmf_silence },
-	{ dtmf_9, sizeof(dtmf_9), DEFAULT_DTMF_LENGTH, &dtmf_silence },
-	{ dtmf_s, sizeof(dtmf_s), DEFAULT_DTMF_LENGTH, &dtmf_silence },
-	{ dtmf_p, sizeof(dtmf_p), DEFAULT_DTMF_LENGTH, &dtmf_silence },
-	{ dtmf_A, sizeof(dtmf_A), DEFAULT_DTMF_LENGTH, &dtmf_silence },
-	{ dtmf_B, sizeof(dtmf_B), DEFAULT_DTMF_LENGTH, &dtmf_silence },
-	{ dtmf_C, sizeof(dtmf_C), DEFAULT_DTMF_LENGTH, &dtmf_silence },
-	{ dtmf_D, sizeof(dtmf_D), DEFAULT_DTMF_LENGTH, &dtmf_silence },
-};
-
-static struct zt_tone mfv1_tones[15] =
-{
-	{ mfv1_0, sizeof(mfv1_0), DEFAULT_MFV1_LENGTH, &mfv1_silence },
-	{ mfv1_1, sizeof(mfv1_1), DEFAULT_MFV1_LENGTH, &mfv1_silence },
-	{ mfv1_2, sizeof(mfv1_2), DEFAULT_MFV1_LENGTH, &mfv1_silence },
-	{ mfv1_3, sizeof(mfv1_3), DEFAULT_MFV1_LENGTH, &mfv1_silence },
-	{ mfv1_4, sizeof(mfv1_4), DEFAULT_MFV1_LENGTH, &mfv1_silence },
-	{ mfv1_5, sizeof(mfv1_5), DEFAULT_MFV1_LENGTH, &mfv1_silence },
-	{ mfv1_6, sizeof(mfv1_6), DEFAULT_MFV1_LENGTH, &mfv1_silence },
-	{ mfv1_7, sizeof(mfv1_7), DEFAULT_MFV1_LENGTH, &mfv1_silence },
-	{ mfv1_8, sizeof(mfv1_8), DEFAULT_MFV1_LENGTH, &mfv1_silence },
-	{ mfv1_9, sizeof(mfv1_9), DEFAULT_MFV1_LENGTH, &mfv1_silence },
-	{ mfv1_s, sizeof(mfv1_s), DEFAULT_MFV1_LENGTH * 5 / 3, &mfv1_silence },
-	{ mfv1_p, sizeof(mfv1_p), DEFAULT_MFV1_LENGTH, &mfv1_silence },
-	{ mfv1_A, sizeof(mfv1_A), DEFAULT_MFV1_LENGTH, &mfv1_silence },
-	{ mfv1_B, sizeof(mfv1_B), DEFAULT_MFV1_LENGTH, &mfv1_silence },
-	{ mfv1_C, sizeof(mfv1_C), DEFAULT_MFV1_LENGTH, &mfv1_silence },
-};
+	{ 0, 0, 0, 0, 0, 0, PAUSE_LENGTH, NULL };
 
+#include "tones.h"
 
 #endif