diff options
author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-20 15:59:44 +0000 |
---|---|---|
committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-20 15:59:44 +0000 |
commit | e5c559bcfb1e1e0359dfe35c2e04455cc187a4d7 (patch) | |
tree | 6c7d6e38741072b9d5b8dca68fbfc1f5349177c3 /include | |
parent | ca3bd71a4ffb3713c2cbbc8e4f24424ddabd5d08 (diff) |
1.4 version of PLC fix.
Analogous to trunk revision 264452, but without the change
to chan_sip since it is not necessary in this branch.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@264541 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
-rw-r--r-- | include/asterisk/channel.h | 6 | ||||
-rw-r--r-- | include/asterisk/options.h | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index e205a83e9..6d872818b 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -1467,6 +1467,12 @@ void ast_channel_whisper_stop(struct ast_channel *chan); */ char *ast_channel_reason2str(int reason); +/*! + * \brief Reload genericplc configuration value from codecs.conf + * + * Implementation is in main/channel.c + */ +int ast_plc_reload(void); #if defined(__cplusplus) || defined(c_plusplus) } diff --git a/include/asterisk/options.h b/include/asterisk/options.h index 086cd28d7..c33006606 100644 --- a/include/asterisk/options.h +++ b/include/asterisk/options.h @@ -80,7 +80,9 @@ enum ast_option_flags { /*! Always fork, even if verbose or debug settings are non-zero */ AST_OPT_FLAG_ALWAYS_FORK = (1 << 21), /*! Disable log/verbose output to remote consoles */ - AST_OPT_FLAG_MUTE = (1 << 22) + AST_OPT_FLAG_MUTE = (1 << 22), + /*! Generic PLC */ + AST_OPT_FLAG_GENERIC_PLC = (1 << 23), }; /*! These are the options that set by default when Asterisk starts */ @@ -113,6 +115,7 @@ enum ast_option_flags { #define ast_opt_internal_timing ast_test_flag(&ast_options, AST_OPT_FLAG_INTERNAL_TIMING) #define ast_opt_always_fork ast_test_flag(&ast_options, AST_OPT_FLAG_ALWAYS_FORK) #define ast_opt_mute ast_test_flag(&ast_options, AST_OPT_FLAG_MUTE) +#define ast_opt_generic_plc ast_test_flag(&ast_options, AST_OPT_FLAG_GENERIC_PLC) extern struct ast_flags ast_options; |