aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/res_adsi.c4
-rw-r--r--res/res_agi.c4
-rw-r--r--res/res_musiconhold.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/res/res_adsi.c b/res/res_adsi.c
index 2df5324aa..39a6cec42 100644
--- a/res/res_adsi.c
+++ b/res/res_adsi.c
@@ -134,7 +134,7 @@ static int adsi_careful_send(struct ast_channel *chan, unsigned char *buf, int l
*remainder = *remainder - amt;
outf.frametype = AST_FRAME_VOICE;
outf.subclass = AST_FORMAT_ULAW;
- outf.data = buf;
+ outf.data.ptr = buf;
outf.datalen = amt;
outf.samples = amt;
if (ast_write(chan, &outf)) {
@@ -174,7 +174,7 @@ static int adsi_careful_send(struct ast_channel *chan, unsigned char *buf, int l
*remainder = inf->datalen - amt;
outf.frametype = AST_FRAME_VOICE;
outf.subclass = AST_FORMAT_ULAW;
- outf.data = buf;
+ outf.data.ptr = buf;
outf.datalen = amt;
outf.samples = amt;
if (ast_write(chan, &outf)) {
diff --git a/res/res_agi.c b/res/res_agi.c
index ae8739136..57cf128da 100644
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -1910,7 +1910,7 @@ static int handle_speechrecognize(struct ast_channel *chan, AGI *agi, int argc,
}
/* Write audio frame data into speech engine if possible */
if (fr && fr->frametype == AST_FRAME_VOICE)
- ast_speech_write(speech, fr->data, fr->datalen);
+ ast_speech_write(speech, fr->data.ptr, fr->datalen);
break;
case AST_SPEECH_STATE_WAIT:
/* Cue waiting sound if not already playing */
@@ -2613,7 +2613,7 @@ static enum agi_result run_agi(struct ast_channel *chan, char *request, AGI *agi
/* If it's voice, write it to the audio pipe */
if ((agi->audio > -1) && (f->frametype == AST_FRAME_VOICE)) {
/* Write, ignoring errors */
- write(agi->audio, f->data, f->datalen);
+ write(agi->audio, f->data.ptr, f->datalen);
}
ast_frfree(f);
}
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index d64e55cce..dffe71986 100644
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -847,7 +847,7 @@ static int moh_generate(struct ast_channel *chan, void *data, int len, int sampl
return 0;
moh->f.datalen = res;
- moh->f.data = buf + AST_FRIENDLY_OFFSET / 2;
+ moh->f.data.ptr = buf + AST_FRIENDLY_OFFSET / 2;
moh->f.samples = ast_codec_get_samples(&moh->f);
if (ast_write(chan, &moh->f) < 0) {