diff options
| author | Sean Bright <sean@malleable.com> | 2012-02-01 15:59:54 +0000 |
|---|---|---|
| committer | Sean Bright <sean@malleable.com> | 2012-02-01 15:59:54 +0000 |
| commit | 544333b435c978507b191c29242aa8d06890073b (patch) | |
| tree | 6f8796e03343c687b5c1c91dcd941fced3a81e81 /include/asterisk/audiohook.h | |
| parent | 863493118b8ec80b14bd6c9de0f57d1d87371f71 (diff) | |
Resolve an overlap in the ast_audiohook_flags values.
AST_AUDIOHOOK_TRIGGER_WRITE and AST_AUDIOHOOK_WANTS_DTMF were overlapping which
may have caused unintended side effects. This patch moves
AST_AUDIOHOOK_TRIGGER_WRITE, and updates AST_AUDIOHOOK_TRIGGER_MODE to reflect
the original intention.
This will affect existing modules that use these flags, so be sure to recompile
as necessary.
(closes issue ASTERISK-19246)
Reported by: feyfre
........
Merged revisions 353598 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 353599 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@353600 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk/audiohook.h')
| -rw-r--r-- | include/asterisk/audiohook.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/asterisk/audiohook.h b/include/asterisk/audiohook.h index fd1da91dd..5e8fc1812 100644 --- a/include/asterisk/audiohook.h +++ b/include/asterisk/audiohook.h @@ -52,17 +52,17 @@ enum ast_audiohook_direction { }; enum ast_audiohook_flags { - AST_AUDIOHOOK_TRIGGER_MODE = (3 << 0), /*!< When audiohook should be triggered to do something */ - AST_AUDIOHOOK_TRIGGER_READ = (1 << 0), /*!< Audiohook wants to be triggered when reading audio in */ + AST_AUDIOHOOK_TRIGGER_MODE = (3 << 0), /*!< When audiohook should be triggered to do something */ + AST_AUDIOHOOK_TRIGGER_READ = (1 << 0), /*!< Audiohook wants to be triggered when reading audio in */ AST_AUDIOHOOK_TRIGGER_WRITE = (2 << 0), /*!< Audiohook wants to be triggered when writing audio out */ - AST_AUDIOHOOK_WANTS_DTMF = (1 << 1), /*!< Audiohook also wants to receive DTMF frames */ - AST_AUDIOHOOK_TRIGGER_SYNC = (1 << 2), /*!< Audiohook wants to be triggered when both sides have combined audio available */ + AST_AUDIOHOOK_WANTS_DTMF = (1 << 2), /*!< Audiohook also wants to receive DTMF frames */ + AST_AUDIOHOOK_TRIGGER_SYNC = (1 << 3), /*!< Audiohook wants to be triggered when both sides have combined audio available */ /*! Audiohooks with this flag set will not allow for a large amount of samples to build up on its * slinfactories. We will flush the factories if they contain too many samples. */ - AST_AUDIOHOOK_SMALL_QUEUE = (1 << 3), - AST_AUDIOHOOK_MUTE_READ = (1 << 4), /*!< audiohook should be mute frames read */ - AST_AUDIOHOOK_MUTE_WRITE = (1 << 5), /*!< audiohook should be mute frames written */ + AST_AUDIOHOOK_SMALL_QUEUE = (1 << 4), + AST_AUDIOHOOK_MUTE_READ = (1 << 5), /*!< audiohook should be mute frames read */ + AST_AUDIOHOOK_MUTE_WRITE = (1 << 6), /*!< audiohook should be mute frames written */ }; enum ast_audiohook_init_flags { |