diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-10-28 16:36:10 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-10-28 16:36:10 +0000 |
| commit | edf894a72ad519c4eff959c15faa97f9b3b7073d (patch) | |
| tree | cfa01a929b2a9712d2b552f9b713fe6124551709 | |
| parent | f67cec6dcc4690953dd6264a9f12e0e800515be5 (diff) | |
use API call for frame volume adjustment
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6878 f38db490-d61c-443f-a65b-d21fe96a405b
| -rwxr-xr-x | apps/app_meetme.c | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 9350566b7..88e5b76ff 100755 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -384,20 +384,6 @@ static void reset_volumes(struct ast_conf_user *user) ast_channel_setoption(user->chan, AST_OPTION_RXGAIN, &zero_volume, sizeof(zero_volume), 0); } -static void adjust_volume(struct ast_frame *f, int vol) -{ - int count; - short *fdata = f->data; - - for (count = 0; count < (f->datalen / sizeof(*fdata)); count++) { - if (vol > 0) { - fdata[count] *= abs(vol); - } else if (vol < 0) { - fdata[count] /= abs(vol); - } - } -} - static void conf_play(struct ast_channel *chan, struct ast_conference *conf, int sound) { unsigned char *data; @@ -1239,9 +1225,9 @@ zapretry: if (!f) break; if ((f->frametype == AST_FRAME_VOICE) && (f->subclass == AST_FORMAT_SLINEAR)) { - if (user->talk.actual) { - adjust_volume(f, user->talk.actual); - } + if (user->talk.actual) + ast_frame_adjust_volume(f, user->talk.actual); + if (confflags & CONFFLAG_MONITORTALKER) { int totalsilence; if (user->talking == -1) @@ -1476,7 +1462,7 @@ zapretry: fr.data = buf; fr.offset = AST_FRIENDLY_OFFSET; if (user->listen.actual) - adjust_volume(&fr, user->listen.actual); + ast_frame_adjust_volume(&fr, user->listen.actual); if (ast_write(chan, &fr) < 0) { ast_log(LOG_WARNING, "Unable to write frame to channel: %s\n", strerror(errno)); /* break; */ |