mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-26 22:30:28 +00:00
convert most of the option_*'s to a single ast_flags structure. Also, fix some
formatting, remove some unnecessary casts, and other little code cleanups. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7331 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -2689,7 +2689,7 @@ int ast_channel_make_compatible(struct ast_channel *chan, struct ast_channel *pe
|
||||
/* if the best path is not 'pass through', then
|
||||
transcoding is needed; if desired, force transcode path
|
||||
to use SLINEAR between channels */
|
||||
if ((src != dst) && option_transcode_slin)
|
||||
if ((src != dst) && ast_opt_transcode_via_slin)
|
||||
dst = AST_FORMAT_SLINEAR;
|
||||
if (ast_set_read_format(chan, dst) < 0) {
|
||||
ast_log(LOG_WARNING, "Unable to set read format on channel %s to %d\n", chan->name, dst);
|
||||
@@ -2710,7 +2710,7 @@ int ast_channel_make_compatible(struct ast_channel *chan, struct ast_channel *pe
|
||||
/* if the best path is not 'pass through', then
|
||||
transcoding is needed; if desired, force transcode path
|
||||
to use SLINEAR between channels */
|
||||
if ((src != dst) && option_transcode_slin)
|
||||
if ((src != dst) && ast_opt_transcode_via_slin)
|
||||
dst = AST_FORMAT_SLINEAR;
|
||||
if (ast_set_read_format(peer, dst) < 0) {
|
||||
ast_log(LOG_WARNING, "Unable to set read format on channel %s to %d\n", peer->name, dst);
|
||||
|
||||
Reference in New Issue
Block a user