diff options
| author | Mark Michelson <mmichelson@digium.com> | 2007-11-30 21:19:57 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2007-11-30 21:19:57 +0000 |
| commit | 6b08c442c78b8b6622ae25505458f320b189e492 (patch) | |
| tree | 978560a7d79aeafa387c5164bc30cb9b72770980 /include | |
| parent | fac74808203c697677a87d34ccc409a3fe203a95 (diff) | |
Adding support for the "automixmonitor" dial and queue options.
This works in much the same way as the automonitor, except that instead of using the monitor
app, it uses the mixmonitor app. By providing an 'x' or 'X' as a dial or queue option, a DTMF
sequence may be entered (as defined in features.conf) to start the one-touch mixmonitor.
This patch also introduces some new API calls to the audiohooks code for searching for an audiohook
by type and for searching for a running audiohook by type.
Big thanks to joetester for writing the initial patch, testing it and patiently waiting for it to
be committed.
(closes issue #10185, reported and patched by xmarksthespot)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@90388 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/app.h | 2 | ||||
| -rw-r--r-- | include/asterisk/audiohook.h | 22 | ||||
| -rw-r--r-- | include/asterisk/channel.h | 1 |
3 files changed, 24 insertions, 1 deletions
diff --git a/include/asterisk/app.h b/include/asterisk/app.h index 656e8390f..f76b0d96f 100644 --- a/include/asterisk/app.h +++ b/include/asterisk/app.h @@ -344,7 +344,7 @@ unsigned int ast_app_separate_args(char *buf, char delim, char **array, int arra */ struct ast_app_option { /*! \brief The flag bit that represents this option. */ - unsigned int flag; + uint64_t flag; /*! \brief The index of the entry in the arguments array that should be used for this option's argument. */ unsigned int arg_index; diff --git a/include/asterisk/audiohook.h b/include/asterisk/audiohook.h index 3fd2eb1bf..5ef0ac294 100644 --- a/include/asterisk/audiohook.h +++ b/include/asterisk/audiohook.h @@ -171,6 +171,28 @@ struct ast_frame *ast_audiohook_write_list(struct ast_channel *chan, struct ast_ */ void ast_audiohook_trigger_wait(struct ast_audiohook *audiohook); +/*! + \brief Find out how many audiohooks from a certain source exist on a given channel, regardless of status. + \param chan The channel on which to find the spies + \param source The audiohook's source + \param type The type of audiohook + \return Return the number of audiohooks which are from the source specified + + Note: Function performs nlocking. +*/ +int ast_channel_audiohook_count_by_source(struct ast_channel *chan, const char *source, enum ast_audiohook_type type); + +/*! + \brief Find out how many spies of a certain type exist on a given channel, and are in state running. + \param chan The channel on which to find the spies + \param source The source of the audiohook + \param type The type of spy to look for + \return Return the number of running audiohooks which are from the source specified + + Note: Function performs no locking. +*/ +int ast_channel_audiohook_count_by_source_running(struct ast_channel *chan, const char *source, enum ast_audiohook_type type); + /*! \brief Lock an audiohook * \param ah Audiohook structure */ diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 4bf33d7bd..aea8f4d8c 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -565,6 +565,7 @@ enum { AST_FEATURE_ATXFER = (1 << 3), AST_FEATURE_AUTOMON = (1 << 4), AST_FEATURE_PARKCALL = (1 << 5), + AST_FEATURE_AUTOMIXMON = (1 << 6), }; /*! \brief bridge configuration */ |