From 99cae5b7508f30a308afbbacf92ad306a30f68df Mon Sep 17 00:00:00 2001 From: Terry Wilson Date: Tue, 24 Jan 2012 20:12:09 +0000 Subject: 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 --- main/app.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'main/app.c') diff --git a/main/app.c b/main/app.c index c27f71341..d7c148581 100644 --- a/main/app.c +++ b/main/app.c @@ -187,7 +187,7 @@ enum ast_getdata_result ast_app_getdata(struct ast_channel *c, const char *promp while ((front = strsep(&filename, "&"))) { ast_test_suite_event_notify("PLAYBACK", "Message: %s\r\nChannel: %s", front, ast_channel_name(c)); if (!ast_strlen_zero(front)) { - res = ast_streamfile(c, front, c->language); + res = ast_streamfile(c, front, ast_channel_language(c)); if (res) continue; } @@ -229,7 +229,7 @@ int ast_app_getdata_full(struct ast_channel *c, const char *prompt, char *s, int int res, to = 2000, fto = 6000; if (!ast_strlen_zero(prompt)) { - res = ast_streamfile(c, prompt, c->language); + res = ast_streamfile(c, prompt, ast_channel_language(c)); if (res < 0) { return res; } @@ -614,7 +614,7 @@ int ast_control_streamfile(struct ast_channel *chan, const char *file, for (;;) { ast_stopstream(chan); - res = ast_streamfile(chan, file, chan->language); + res = ast_streamfile(chan, file, ast_channel_language(chan)); if (!res) { if (pause_restart_point) { ast_seekstream(chan->stream, pause_restart_point, SEEK_SET); @@ -703,7 +703,7 @@ int ast_play_and_wait(struct ast_channel *chan, const char *fn) int d = 0; ast_test_suite_event_notify("PLAYBACK", "Message: %s\r\nChannel: %s", fn, ast_channel_name(chan)); - if ((d = ast_streamfile(chan, fn, chan->language))) { + if ((d = ast_streamfile(chan, fn, ast_channel_language(chan)))) { return d; } -- cgit v1.2.3