From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Fri, 13 Jan 2006 07:14:42 +0000 (+0000)
Subject: Somebody complained the that length of the dah wasn't quite up to spec...
X-Git-Tag: 1.4.0-beta1~2952
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=caa0de6e99398664e3bb6a986abc8f4542f8aa8a;p=thirdparty%2Fasterisk.git

Somebody complained the that length of the dah wasn't quite up to spec...


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@8051 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_morsecode.c b/apps/app_morsecode.c
index 04c88b3903..459b67640f 100644
--- a/apps/app_morsecode.c
+++ b/apps/app_morsecode.c
@@ -55,12 +55,8 @@ STANDARD_LOCAL_USER;
 
 LOCAL_USER_DECL;
 
-#define	TONE	440
-#define	DITLEN	100
-#define	DAHLEN	250
-#define	DITDAHSEPLEN	50
-#define	CHARSEPLEN	200
-/* Pause between words will be twice CHARSEPLEN plus DITDAHSEPLEN - 450 */
+#define	TONE	800
+#define	DITLEN	80
 
 static char *morsecode[] = {
 	"", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", /*  0-15 */
@@ -109,9 +105,9 @@ static char *morsecode[] = {
 static void playtone(struct ast_channel *chan, int tone, int len)
 {
 	char dtmf[20];
-	snprintf(dtmf, sizeof(dtmf), "%d/%d", tone, len);
+	snprintf(dtmf, sizeof(dtmf), "%d/%d", tone, DITLEN * len);
 	ast_playtones_start(chan, 0, dtmf, 0);
-	ast_safe_sleep(chan, len);
+	ast_safe_sleep(chan, DITLEN * len);
 	ast_playtones_stop(chan);
 }
 
@@ -136,18 +132,19 @@ static int morsecode_exec(struct ast_channel *chan, void *data)
 		}
 		for (dahdit = morsecode[(int)*digit]; *dahdit; dahdit++) {
 			if (*dahdit == '-') {
-				playtone(chan, TONE, DAHLEN);
+				playtone(chan, TONE, 3);
 			} else if (*dahdit == '.') {
-				playtone(chan, TONE, DITLEN);
+				playtone(chan, TONE, 1);
 			} else {
-				playtone(chan, TONE, CHARSEPLEN);
+				/* Account for ditlen of silence immediately following */
+				playtone(chan, 0, 2);
 			}
 
 			/* Pause slightly between each dit and dah */
-			playtone(chan, 0, DITDAHSEPLEN);
+			playtone(chan, 0, 1);
 		}
 		/* Pause between characters */
-		playtone(chan, 0, CHARSEPLEN);
+		playtone(chan, 0, 2);
 	}
 
 	LOCAL_USER_REMOVE(u);