diff options
author | malcolmd <malcolmd@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-01-08 15:47:16 +0000 |
---|---|---|
committer | malcolmd <malcolmd@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-01-08 15:47:16 +0000 |
commit | 404eacef9207762c26ed6f9a9fe627e989917962 (patch) | |
tree | 52c2f0c5bdd2e2b8b8612f04a020d09842599b17 /indications.c | |
parent | 46cbc15f6226894b73ddc0ab58a05663bdf96111 (diff) |
Fix to generate tones having one amplitude modulated by another: Bug #746
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1902 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'indications.c')
-rwxr-xr-x | indications.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/indications.c b/indications.c index 180b948b2..864fd6a3d 100755 --- a/indications.c +++ b/indications.c @@ -31,6 +31,7 @@ struct playtones_item { int freq1; int freq2; int duration; + int modulate; }; struct playtones_def { @@ -103,7 +104,15 @@ static int playtones_generator(struct ast_channel *chan, void *data, int len, in pi = &ps->items[ps->npos]; for (x=0;x<len/2;x++) { - ps->data[x] = ps->vol * ( + if (pi->modulate) + /* Modulate 1st tone with 2nd, to 90% modulation depth */ + ps->data[x] = ps->vol * 2 * ( + sin((pi->freq1 * 2.0 * M_PI / 8000.0) * (ps->pos + x)) * + (0.9 * fabs(sin((pi->freq2 * 2.0 * M_PI / 8000.0) * (ps->pos + x))) + 0.1) + ); + else + /* Add 2 tones together */ + ps->data[x] = ps->vol * ( sin((pi->freq1 * 2.0 * M_PI / 8000.0) * (ps->pos + x)) + sin((pi->freq2 * 2.0 * M_PI / 8000.0) * (ps->pos + x)) ); @@ -157,7 +166,7 @@ int ast_playtones_start(struct ast_channel *chan, int vol, const char *playlst, separator = ","; s = strsep(&stringp,separator); while(s && *s) { - int freq1, freq2, time; + int freq1, freq2, time, modulate=0; if (s[0]=='!') s++; @@ -168,6 +177,13 @@ int ast_playtones_start(struct ast_channel *chan, int vol, const char *playlst, } else if (sscanf(s, "%d+%d", &freq1, &freq2) == 2) { /* f1+f2 format */ time = 0; + } else if (sscanf(s, "%d*%d/%d", &freq1, &freq2, &time) == 3) { + /* f1*f2/time format */ + modulate = 1; + } else if (sscanf(s, "%d*%d", &freq1, &freq2) == 2) { + /* f1*f2 format */ + time = 0; + modulate = 1; } else if (sscanf(s, "%d/%d", &freq1, &time) == 2) { /* f1/time format */ freq2 = 0; @@ -186,6 +202,7 @@ int ast_playtones_start(struct ast_channel *chan, int vol, const char *playlst, d.items[d.nitems].freq1 = freq1; d.items[d.nitems].freq2 = freq2; d.items[d.nitems].duration = time; + d.items[d.nitems].modulate = modulate; d.nitems++; s = strsep(&stringp,separator); |