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
This commit is contained in:
Mark Spencer
2004-12-24 01:40:07 +00:00
parent f72f506f34
commit 713a2eb072
6 changed files with 411 additions and 56 deletions

View File

@@ -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;