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: https://origsvn.digium.com/svn/asterisk/branches/1.4@264541 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2010-05-20 15:59:44 +00:00
parent f428d9bfdb
commit 610c1dc6bf
4 changed files with 118 additions and 5 deletions
+6
View File
@@ -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)
}
+4 -1
View File
@@ -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;