diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2013-07-24 23:40:12 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2013-07-24 23:40:12 +0000 |
| commit | 517eb93873e6d706aea355c44ecf1eba61571375 (patch) | |
| tree | 99cd5b5995561890a45ec106becd2198524c1bec /include | |
| parent | 07d2694f725557854142fb6ae8fafa0e708b389e (diff) | |
Simplify interval hooks since there is only one bridge threading model now.
* Convert interval timers to use the ast_waitfor_nandfds() timeout.
* Remove bridge channel action for intervals. Now the main loop handles
running interval hooks.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395340 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/bridging_channel_internal.h | 2 | ||||
| -rw-r--r-- | include/asterisk/bridging_features.h | 4 |
2 files changed, 0 insertions, 6 deletions
diff --git a/include/asterisk/bridging_channel_internal.h b/include/asterisk/bridging_channel_internal.h index 9bc9b11f9..cbfa20aa6 100644 --- a/include/asterisk/bridging_channel_internal.h +++ b/include/asterisk/bridging_channel_internal.h @@ -40,8 +40,6 @@ enum bridge_channel_action_type { /*! Bridged channel is to detect a feature hook */ BRIDGE_CHANNEL_ACTION_FEATURE, - /*! Bridged channel is to act on an interval hook */ - BRIDGE_CHANNEL_ACTION_INTERVAL, /*! Bridged channel is to send a DTMF stream out */ BRIDGE_CHANNEL_ACTION_DTMF_STREAM, /*! Bridged channel is to indicate talking start */ diff --git a/include/asterisk/bridging_features.h b/include/asterisk/bridging_features.h index acdd6e0ba..dacb6c698 100644 --- a/include/asterisk/bridging_features.h +++ b/include/asterisk/bridging_features.h @@ -226,8 +226,6 @@ struct ast_bridge_hook_timer { struct ast_bridge_hook_timer_parms timer; }; -#define BRIDGE_FEATURES_INTERVAL_RATE 10 - /*! * \brief Structure that contains features information */ @@ -238,8 +236,6 @@ struct ast_bridge_features { struct ao2_container *other_hooks; /*! Attached interval hooks */ struct ast_heap *interval_hooks; - /*! Used to determine when interval based features should be checked */ - struct ast_timer *interval_timer; /*! Limits feature data */ struct ast_bridge_features_limits *limits; /*! Feature flags that are enabled */ |