diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2013-02-05 18:13:09 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2013-02-05 18:13:09 +0000 |
| commit | 657aa491f00b7a3693ab8ddfb4623f516fda33b0 (patch) | |
| tree | 966a9edd7901afa805d4426b59549ec9dc670bfe /main | |
| parent | eb61bb96b7fcc79ef41bcb548331fe1991ed1f51 (diff) | |
Separate option_types[] from the struct definition.
Updated the option_types[] doxygen comment.
........
Merged revisions 380853 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 380854 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@380855 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -rw-r--r-- | main/dial.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/main/dial.c b/main/dial.c index bbaee7ca6..52a270970 100644 --- a/main/dial.c +++ b/main/dial.c @@ -167,12 +167,19 @@ static void answer_exec_run(struct ast_dial *dial, struct ast_dial_channel *dial return; } -/*! \brief Options structure - maps options to respective handlers (enable/disable). This list MUST be perfectly kept in order, or else madness will happen. */ -static const struct ast_option_types { +struct ast_option_types { enum ast_dial_option option; ast_dial_option_cb_enable enable; ast_dial_option_cb_disable disable; -} option_types[] = { +}; + +/*! + * \brief Map options to respective handlers (enable/disable). + * + * \note This list MUST be perfectly kept in order with enum + * ast_dial_option, or else madness will happen. + */ +static const struct ast_option_types option_types[] = { { AST_DIAL_OPTION_RINGING, NULL, NULL }, /*!< Always indicate ringing to caller */ { AST_DIAL_OPTION_ANSWER_EXEC, answer_exec_enable, answer_exec_disable }, /*!< Execute application upon answer in async mode */ { AST_DIAL_OPTION_MUSIC, music_enable, music_disable }, /*!< Play music to the caller instead of ringing */ |