diff options
author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-12-24 01:40:07 +0000 |
---|---|---|
committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-12-24 01:40:07 +0000 |
commit | 05c1466c552ff0085a191038e034030a3681d53e (patch) | |
tree | 5b80a7b0d9f29485a99055442adc6b277aa4357f /include | |
parent | 461f9cdb357b9dd51ed1072b61310424d0db22d6 (diff) |
Merge anthm's native MOH patch (bug #2639) he promises me he'll rid it of ast_flag_moh...
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@4552 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
-rwxr-xr-x | include/asterisk/channel.h | 4 | ||||
-rwxr-xr-x | include/asterisk/file.h | 9 | ||||
-rwxr-xr-x | include/asterisk/musiconhold.h | 5 |
3 files changed, 16 insertions, 2 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; diff --git a/include/asterisk/file.h b/include/asterisk/file.h index 2f67fc23f..1686914df 100755 --- a/include/asterisk/file.h +++ b/include/asterisk/file.h @@ -203,6 +203,15 @@ struct ast_filestream *ast_openstream(struct ast_channel *chan, const char *file * \param chan channel to work with * \param filename to use * \param preflang prefered language to use + * \param asis if set, don't clear generators + * Returns a ast_filestream pointer if it opens the file, NULL on error + */ +struct ast_filestream *ast_openstream_full(struct ast_channel *chan, const char *filename, const char *preflang, int asis); +//! Opens stream for use in seeking, playing +/*! + * \param chan channel to work with + * \param filename to use + * \param preflang prefered language to use * Returns a ast_filestream pointer if it opens the file, NULL on error */ struct ast_filestream *ast_openvstream(struct ast_channel *chan, const char *filename, const char *preflang); diff --git a/include/asterisk/musiconhold.h b/include/asterisk/musiconhold.h index 39c90bd85..f6b46c99d 100755 --- a/include/asterisk/musiconhold.h +++ b/include/asterisk/musiconhold.h @@ -25,8 +25,11 @@ extern int ast_moh_start(struct ast_channel *chan, char *mclass); extern void ast_moh_stop(struct ast_channel *chan); extern void ast_install_music_functions(int (*start_ptr)(struct ast_channel *, char *), - void (*stop_ptr)(struct ast_channel *)); + void (*stop_ptr)(struct ast_channel *), + void (*cleanup_ptr)(struct ast_channel *)); + extern void ast_uninstall_music_functions(void); +void ast_moh_cleanup(struct ast_channel *chan); #if defined(__cplusplus) || defined(c_plusplus) } |