[svn-commits] mvanbaak: branch mvanbaak/ast_frame_dataunion r117250 - /team/mvanbaak/ast_fr...

[SVN commits to the Digium repositories]

Author: mvanbaak
Date: Mon May 19 17:22:08 2008
New Revision: 117250

URL: http://svn.digium.com/view/asterisk?view=rev&rev=117250
Log:
make res/ compile

Modified:
    team/mvanbaak/ast_frame_dataunion/res/res_adsi.c
    team/mvanbaak/ast_frame_dataunion/res/res_agi.c
    team/mvanbaak/ast_frame_dataunion/res/res_musiconhold.c

Modified: team/mvanbaak/ast_frame_dataunion/res/res_adsi.c
URL: http://svn.digium.com/view/asterisk/team/mvanbaak/ast_frame_dataunion/res/res_adsi.c?view=diff&rev=117250&r1=117249&r2=117250
==============================================================================
--- team/mvanbaak/ast_frame_dataunion/res/res_adsi.c (original)
+++ team/mvanbaak/ast_frame_dataunion/res/res_adsi.c Mon May 19 17:22:08 2008
@@ -134,7 +134,7 @@
 			*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 @@
 			*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)) {

Modified: team/mvanbaak/ast_frame_dataunion/res/res_agi.c
URL: http://svn.digium.com/view/asterisk/team/mvanbaak/ast_frame_dataunion/res/res_agi.c?view=diff&rev=117250&r1=117249&r2=117250
==============================================================================
--- team/mvanbaak/ast_frame_dataunion/res/res_agi.c (original)
+++ team/mvanbaak/ast_frame_dataunion/res/res_agi.c Mon May 19 17:22:08 2008
@@ -1910,7 +1910,7 @@
 			}
 			/* 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 @@
 				/* 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);
 			}

Modified: team/mvanbaak/ast_frame_dataunion/res/res_musiconhold.c
URL: http://svn.digium.com/view/asterisk/team/mvanbaak/ast_frame_dataunion/res/res_musiconhold.c?view=diff&rev=117250&r1=117249&r2=117250
==============================================================================
--- team/mvanbaak/ast_frame_dataunion/res/res_musiconhold.c (original)
+++ team/mvanbaak/ast_frame_dataunion/res/res_musiconhold.c Mon May 19 17:22:08 2008
@@ -847,7 +847,7 @@
 		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) {