diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-18 01:51:21 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-18 01:51:21 +0000 |
commit | d3323c9c37e93007eae9df8b25a174fc9cbcbbfa (patch) | |
tree | 44c03bd656930ad4b36b921854685fd0ab516452 /apps | |
parent | e9def2b3fb87a25a2fdbed138f1a5331ff1b08d9 (diff) |
revert commit that included extranous changes
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@182807 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r-- | apps/app_chanspy.c | 18 | ||||
-rw-r--r-- | apps/app_meetme.c | 16 | ||||
-rw-r--r-- | apps/app_mixmonitor.c | 11 |
3 files changed, 14 insertions, 31 deletions
diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c index 3f19b04af..18e4972a5 100644 --- a/apps/app_chanspy.c +++ b/apps/app_chanspy.c @@ -171,7 +171,7 @@ static void spy_release(struct ast_channel *chan, void *data) static int spy_generate(struct ast_channel *chan, void *data, int len, int samples) { struct chanspy_translation_helper *csth = data; - struct ast_frame *f, *cur; + struct ast_frame *f; ast_audiohook_lock(&csth->spy_audiohook); if (csth->spy_audiohook.status != AST_AUDIOHOOK_STATUS_RUNNING) { @@ -186,16 +186,14 @@ static int spy_generate(struct ast_channel *chan, void *data, int len, int sampl if (!f) return 0; - for (cur = f; cur; cur = AST_LIST_NEXT(cur, frame_list)) { - if (ast_write(chan, cur)) { - ast_frfree(f); - return -1; - } + if (ast_write(chan, f)) { + ast_frfree(f); + return -1; + } - if (csth->fd) { - if (write(csth->fd, cur->data, cur->datalen) < 0) { - ast_log(LOG_WARNING, "write() failed: %s\n", strerror(errno)); - } + if (csth->fd) { + if (write(csth->fd, f->data, f->datalen) < 0) { + ast_log(LOG_WARNING, "write() failed: %s\n", strerror(errno)); } } diff --git a/apps/app_meetme.c b/apps/app_meetme.c index a314a79f0..67c851a2c 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -2338,19 +2338,9 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c } } if (conf->transframe[index]) { - if ((conf->transframe[index]->frametype != AST_FRAME_NULL) && - can_write(chan, confflags)) { - struct ast_frame *cur; - - /* the translator may have returned a list of frames, so - write each one onto the channel - */ - for (cur = conf->transframe[index]; cur; cur = AST_LIST_NEXT(cur, frame_list)) { - if (ast_write(chan, cur)) { - ast_log(LOG_WARNING, "Unable to write frame to channel %s\n", chan->name); - break; - } - } + if (conf->transframe[index]->frametype != AST_FRAME_NULL) { + if (can_write(chan, confflags) && ast_write(chan, conf->transframe[index])) + ast_log(LOG_WARNING, "Unable to write frame to channel %s\n", chan->name); } } else { ast_mutex_unlock(&conf->listenlock); diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c index f1a1624a8..4d5f5be26 100644 --- a/apps/app_mixmonitor.c +++ b/apps/app_mixmonitor.c @@ -229,14 +229,9 @@ static void *mixmonitor_thread(void *obj) } } - /* Write out the frame(s) */ - if (fs) { - struct ast_frame *cur; - - for (cur = fr; cur; cur = AST_LIST_NEXT(cur, frame_list)) { - ast_writestream(fs, cur); - } - } + /* Write out the frame */ + if (fs) + ast_writestream(fs, fr); } else { ast_mutex_unlock(&mixmonitor->mixmonitor_ds->lock); } |