| 12345678910111213141516171819202122232425262728293031323334353637 |
- --- asterisk-1.4.27.1.orig/channels/chan_oss.c 2009-08-10 21:15:57.000000000 +0200
- +++ asterisk-1.4.27.1/channels/chan_oss.c 2009-12-03 20:58:13.000000000 +0100
- @@ -562,7 +562,7 @@ static void send_sound(struct chan_oss_p
- l = FRAME_SIZE - ofs;
- if (l > s->datalen - start) /* don't overflow the source */
- l = s->datalen - start;
- - bcopy(s->data + start, myframe + ofs, l * 2);
- + memcpy(myframe + ofs, s->data + start, l * 2);
- if (0)
- ast_log(LOG_WARNING, "send_sound sound %d/%d of %d into %d\n", l_sampsent, l, s->samplen, ofs);
- l_sampsent += l;
- @@ -573,14 +573,14 @@ static void send_sound(struct chan_oss_p
- if (l > 0) {
- if (l > FRAME_SIZE - ofs)
- l = FRAME_SIZE - ofs;
- - bcopy(silence, myframe + ofs, l * 2);
- + memcpy(myframe + ofs, silence, l * 2);
- l_sampsent += l;
- } else { /* silence is over, restart sound if loop */
- if (s->repeat == 0) { /* last block */
- o->cursound = -1;
- o->nosound = 0; /* allow audio data */
- if (ofs < FRAME_SIZE) /* pad with silence */
- - bcopy(silence, myframe + ofs, (FRAME_SIZE - ofs) * 2);
- + memcpy(myframe + ofs, silence, (FRAME_SIZE - ofs) * 2);
- }
- l_sampsent = 0;
- }
- @@ -905,7 +905,7 @@ static struct ast_frame *oss_read(struct
-
- /* XXX can be simplified returning &ast_null_frame */
- /* prepare a NULL frame in case we don't have enough data to return */
- - bzero(f, sizeof(struct ast_frame));
- + memset(f, 0, sizeof(struct ast_frame));
- f->frametype = AST_FRAME_NULL;
- f->src = oss_tech.type;
-
|
