diff options
| author | Steve Murphy <murf@digium.com> | 2009-02-02 19:02:24 +0000 |
|---|---|---|
| committer | Steve Murphy <murf@digium.com> | 2009-02-02 19:02:24 +0000 |
| commit | 53d9b77898032a709317357e621e58ef1bccd048 (patch) | |
| tree | 49b361fc00c9abec7db74dd6472b13a8d8b54e59 /include/asterisk/features.h | |
| parent | fdcc0a9a601c10e3b78abb7344f41bec37841fb4 (diff) | |
This reverts the changes I made for 11583; will
reviewboard this before committing again...
reopened 11583 until all Russell's issues are
resolved.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@172929 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk/features.h')
| -rw-r--r-- | include/asterisk/features.h | 37 |
1 files changed, 7 insertions, 30 deletions
diff --git a/include/asterisk/features.h b/include/asterisk/features.h index f0e54a73b..4d581885d 100644 --- a/include/asterisk/features.h +++ b/include/asterisk/features.h @@ -36,15 +36,6 @@ #define PARK_APP_NAME "Park" -#define FEATURE_RETURN_HANGUP -1 -#define FEATURE_RETURN_SUCCESSBREAK 0 -#define FEATURE_RETURN_PASSDIGITS 21 -#define FEATURE_RETURN_STOREDIGITS 22 -#define FEATURE_RETURN_SUCCESS 23 -#define FEATURE_RETURN_KEEPTRYING 24 - -typedef int (*feature_operation)(struct ast_channel *chan, struct ast_channel *peer, struct ast_bridge_config *config, char *code, int sense, void *data); - /*! \brief main call feature structure */ enum { @@ -62,7 +53,7 @@ struct ast_call_feature { char sname[FEATURE_SNAME_LEN]; char exten[FEATURE_MAX_LEN]; char default_exten[FEATURE_MAX_LEN]; - feature_operation operation; + int (*operation)(struct ast_channel *chan, struct ast_channel *peer, struct ast_bridge_config *config, char *code, int sense, void *data); unsigned int flags; char app[FEATURE_APP_LEN]; char app_args[FEATURE_APP_ARGS_LEN]; @@ -70,20 +61,12 @@ struct ast_call_feature { AST_LIST_ENTRY(ast_call_feature) feature_entry; }; -#define AST_FEATURE_RETURN_HANGUP FEATURE_RETURN_HANGUP -#define AST_FEATURE_RETURN_SUCCESSBREAK FEATURE_RETURN_SUCCESSBREAK -#define AST_FEATURE_RETURN_PASSDIGITS FEATURE_RETURN_PASSDIGITS -#define AST_FEATURE_RETURN_STOREDIGITS FEATURE_RETURN_STOREDIGITS -#define AST_FEATURE_RETURN_SUCCESS FEATURE_RETURN_SUCCESS -#define AST_FEATURE_RETURN_KEEPTRYING FEATURE_RETURN_KEEPTRYING - -struct feature_interpret_result { - struct ast_call_feature *builtin_feature; - struct ast_call_feature *dynamic_features[20]; - struct ast_call_feature *group_features[20]; - int num_dyn_features; - int num_grp_features; -}; +#define AST_FEATURE_RETURN_HANGUP -1 +#define AST_FEATURE_RETURN_SUCCESSBREAK 0 +#define AST_FEATURE_RETURN_PASSDIGITS 21 +#define AST_FEATURE_RETURN_STOREDIGITS 22 +#define AST_FEATURE_RETURN_SUCCESS 23 +#define AST_FEATURE_RETURN_KEEPTRYING 24 /*! * \brief Park a call and read back parked location @@ -139,12 +122,6 @@ void ast_register_feature(struct ast_call_feature *feature); \param feature the ast_call_feature object which was registered before*/ void ast_unregister_feature(struct ast_call_feature *feature); -int ast_feature_detect(struct ast_channel *chan, const struct ast_flags *features, char *code, struct feature_interpret_result *result, const char *dynamic_features); - -void ast_features_lock(void); -void ast_features_unlock(void); - - /*! \brief look for a call feature entry by its sname \param name a string ptr, should match "automon", "blindxfer", "atxfer", etc. */ struct ast_call_feature *ast_find_call_feature(const char *name); |