diff options
| author | Terry Wilson <twilson@digium.com> | 2012-01-24 20:12:09 +0000 |
|---|---|---|
| committer | Terry Wilson <twilson@digium.com> | 2012-01-24 20:12:09 +0000 |
| commit | 99cae5b7508f30a308afbbacf92ad306a30f68df (patch) | |
| tree | bdca00ce837e60a5f9a16fed06d02f6e77235035 /apps/app_externalivr.c | |
| parent | 2144ba5df2813609024964c4c2d9060b30d5cd43 (diff) | |
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
Diffstat (limited to 'apps/app_externalivr.c')
| -rw-r--r-- | apps/app_externalivr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/app_externalivr.c b/apps/app_externalivr.c index d8ff60ab0..9377d2320 100644 --- a/apps/app_externalivr.c +++ b/apps/app_externalivr.c @@ -219,7 +219,7 @@ static int gen_nextfile(struct gen_state *state) u->playing_silence = 1; } - if (!(state->stream = ast_openstream_full(u->chan, file_to_stream, u->chan->language, 1))) { + if (!(state->stream = ast_openstream_full(u->chan, file_to_stream, ast_channel_language(u->chan), 1))) { ast_chan_log(LOG_WARNING, u->chan, "File '%s' could not be opened: %s\n", file_to_stream, strerror(errno)); AST_LIST_LOCK(&u->playlist); AST_LIST_REMOVE_HEAD(&u->playlist, list); @@ -761,7 +761,7 @@ static int eivr_comm(struct ast_channel *chan, struct ivr_localuser *u, send_eivr_event(eivr_events, 'Z', NULL, chan); continue; } - if (!ast_fileexists(&input[2], NULL, u->chan->language)) { + if (!ast_fileexists(&input[2], NULL, ast_channel_language(u->chan))) { ast_chan_log(LOG_WARNING, chan, "Unknown file requested '%s'\n", &input[2]); send_eivr_event(eivr_events, 'Z', &input[2], chan); } else { @@ -791,7 +791,7 @@ static int eivr_comm(struct ast_channel *chan, struct ivr_localuser *u, send_eivr_event(eivr_events, 'Z', NULL, chan); continue; } - if (!ast_fileexists(&input[2], NULL, u->chan->language)) { + if (!ast_fileexists(&input[2], NULL, ast_channel_language(u->chan))) { ast_chan_log(LOG_WARNING, chan, "Unknown file requested '%s'\n", &input[2]); send_eivr_event(eivr_events, 'Z', &input[2], chan); } else { |