diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-06 00:22:20 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-06 00:22:20 +0000 |
commit | 75d8cbb5511c40341ac442a3a8e57f6d811c7ab8 (patch) | |
tree | 2bc9241e535f22e7c7ae3deb2fddd2f0b1c30d83 /apps | |
parent | 302e0dc67407eb3e2dc0c8e4f95544a4dba32137 (diff) |
Merged revisions 106239 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r106239 | file | 2008-03-05 16:43:22 -0600 (Wed, 05 Mar 2008) | 12 lines
Merged revisions 106235 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r106235 | file | 2008-03-05 18:32:10 -0400 (Wed, 05 Mar 2008) | 4 lines
Add a control frame to indicate the source of media has changed. Depending on the underlying technology it may need to change some things.
(closes issue #12148)
Reported by: jcomellas
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@106318 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r-- | apps/app_dial.c | 7 | ||||
-rw-r--r-- | apps/app_followme.c | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index f93ba0de9..03799d2b5 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -716,6 +716,10 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in, ast_verb(3, "%s requested a video update, passing it to %s\n", c->name, in->name); ast_indicate(in, AST_CONTROL_VIDUPDATE); break; + case AST_CONTROL_SRCUPDATE: + ast_verb(3, "%s requested a source update, passing it to %s\n", c->name, in->name); + ast_indicate(in, AST_CONTROL_SRCUPDATE); + break; case AST_CONTROL_PROCEEDING: ast_verb(3, "%s is proceeding passing it to %s\n", c->name, in->name); if (single && CAN_EARLY_BRIDGE(peerflags)) @@ -819,7 +823,8 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in, if (single && (f->frametype == AST_FRAME_CONTROL) && ((f->subclass == AST_CONTROL_HOLD) || (f->subclass == AST_CONTROL_UNHOLD) || - (f->subclass == AST_CONTROL_VIDUPDATE))) { + (f->subclass == AST_CONTROL_VIDUPDATE) || + (f->subclass == AST_CONTROL_SRCUPDATE))) { ast_verb(3, "%s requested special control %d, passing it to %s\n", in->name, f->subclass, outgoing->chan->name); ast_indicate_data(outgoing->chan, f->subclass, f->data, f->datalen); } diff --git a/apps/app_followme.c b/apps/app_followme.c index c3c0d88a4..c52a702f7 100644 --- a/apps/app_followme.c +++ b/apps/app_followme.c @@ -659,6 +659,9 @@ static struct ast_channel *wait_for_winner(struct findme_user_listptr *findme_us case AST_CONTROL_VIDUPDATE: ast_verb(3, "%s requested a video update, passing it to %s\n", winner->name, caller->name); break; + case AST_CONTROL_SRCUPDATE: + ast_verb(3, "%s requested a source update, passing it to %s\n", winner->name, caller->name); + break; case AST_CONTROL_PROCEEDING: ast_verb(3, "%s is proceeding passing it to %s\n", winner->name,caller->name); break; |