mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-03 11:25:35 +00:00
Opaquify channel stringfields
Continue channel opaque-ification by wrapping all of the stringfields. Eventually, we will restrict what can actually set these variables, but the purpose for now is to hide the implementation and keep people from adding code that directly accesses the channel structure. Semantic changes will follow afterward. Review: https://reviewboard.asterisk.org/r/1661/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@352348 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -800,7 +800,7 @@ static int common_exec(struct ast_channel *chan, struct ast_flags *flags,
|
||||
struct ast_channel *prev = NULL;
|
||||
|
||||
if (!ast_test_flag(flags, OPTION_QUIET) && num_spyed_upon) {
|
||||
res = ast_streamfile(chan, "beep", chan->language);
|
||||
res = ast_streamfile(chan, "beep", ast_channel_language(chan));
|
||||
if (!res)
|
||||
res = ast_waitstream(chan, "");
|
||||
else if (res < 0) {
|
||||
@@ -960,7 +960,7 @@ static int common_exec(struct ast_channel *chan, struct ast_flags *flags,
|
||||
if (!ast_test_flag(flags, OPTION_NAME) || res < 0) {
|
||||
if (!ast_test_flag(flags, OPTION_NOTECH)) {
|
||||
if (ast_fileexists(peer_name, NULL, NULL) > 0) {
|
||||
res = ast_streamfile(chan, peer_name, chan->language);
|
||||
res = ast_streamfile(chan, peer_name, ast_channel_language(chan));
|
||||
if (!res) {
|
||||
res = ast_waitstream(chan, "");
|
||||
}
|
||||
@@ -969,11 +969,11 @@ static int common_exec(struct ast_channel *chan, struct ast_flags *flags,
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
res = ast_say_character_str(chan, peer_name, "", chan->language);
|
||||
res = ast_say_character_str(chan, peer_name, "", ast_channel_language(chan));
|
||||
}
|
||||
}
|
||||
if ((num = atoi(ptr)))
|
||||
ast_say_digits(chan, atoi(ptr), "", chan->language);
|
||||
ast_say_digits(chan, atoi(ptr), "", ast_channel_language(chan));
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user