summaryrefslogtreecommitdiff
path: root/include/asterisk/channel.h
diff options
context:
space:
mode:
authorMark Spencer <markster@digium.com>2004-12-24 01:40:07 +0000
committerMark Spencer <markster@digium.com>2004-12-24 01:40:07 +0000
commit713a2eb0721a06f10fe0b13d3123446675927f05 (patch)
tree5b80a7b0d9f29485a99055442adc6b277aa4357f /include/asterisk/channel.h
parentf72f506f340b469ecfc9cf72a6890ec4d62f3d88 (diff)
Merge anthm's native MOH patch (bug #2639) he promises me he'll rid it of ast_flag_moh...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4552 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk/channel.h')
-rwxr-xr-xinclude/asterisk/channel.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index 0a1bf0222..909e314cc 100755
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -88,7 +88,8 @@ struct ast_channel {
/*! Default music class */
char musicclass[MAX_LANGUAGE];
-
+ /*! Music State*/
+ void *music_state;
/*! Current generator data if there is any */
void *generatordata;
/*! Current active data generator */
@@ -230,6 +231,7 @@ struct ast_channel {
#define AST_FLAG_BLOCKING (1 << 3) /* if we are blocking */
#define AST_FLAG_ZOMBIE (1 << 4) /* if we are a zombie */
#define AST_FLAG_EXCEPTION (1 << 5) /* if there is a pending exception */
+#define AST_FLAG_MOH (1 << 6) /* XXX anthm promises me this will disappear XXX listening to moh */
struct ast_bridge_config {
int play_to_caller;