app_page and app_confbridge: Fix custom announcement on entering conference.
authorRichard Mudgett <rmudgett@digium.com>
Tue, 5 Feb 2013 19:11:33 +0000 (19:11 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Tue, 5 Feb 2013 19:11:33 +0000 (19:11 +0000)
commitfe6fc6e3b0395819fe905851324823c1b52c1b6a
treefce9f945007842b1ac74b7462237c541fee9b2f9
parent128d7abb05328ba4b7d6fdde17fd7f3873fa587b
app_page and app_confbridge: Fix custom announcement on entering conference.

The Page and ConfBridge custom announcement did not play when users
entered the conference.

* Fix the CONFBRIDGE(user,announcement) file not getting played.  The code
to do this got removed accidentally when the ConfBridge code was
restructured to be more state machine like.

* Fixed play_prompt_to_user() doxygen comments.

* Fixed the Page A(x) and n options for the caller.  The caller never
played the announcement file and totally ignored the n option.  The code
to do this was lost when the application was converted to use ConfBridge.

* Factored out setup_profile_bridge(), setup_profile_paged(), and
setup_profile_caller() routines to setup ConfBridge profiles.  Made each
profile setup routine use the default template if one has not already been
setup by dialplan.

(closes issue ASTERISK-20990)
Reported by: Jeremy Kister
Tested by: rmudgett
........

Merged revisions 380894 from http://svn.asterisk.org/svn/asterisk/branches/11

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@380896 65c4cc65-6c06-0410-ace0-fbb531ad65f3
apps/app_confbridge.c
apps/app_page.c