[asterisk-commits] rmudgett: trunk r357814 - /trunk/channels/chan_usbradio.c
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri Mar 2 10:01:07 CST 2012
Author: rmudgett
Date: Fri Mar 2 10:01:05 2012
New Revision: 357814
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=357814
Log:
Fix compile error from latest channel opaquification change.
Modified:
trunk/channels/chan_usbradio.c
Modified: trunk/channels/chan_usbradio.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_usbradio.c?view=diff&rev=357814&r1=357813&r2=357814
==============================================================================
--- trunk/channels/chan_usbradio.c (original)
+++ trunk/channels/chan_usbradio.c Fri Mar 2 10:01:05 2012
@@ -1526,8 +1526,9 @@
ast_log(LOG_WARNING, "Unable to re-open DSP device %d: %s\n", o->devicenum, strerror(errno));
return -1;
}
- if (o->owner)
- o->owner->fds[0] = fd;
+ if (o->owner) {
+ ast_channel_internal_fd_set(o->owner, 0, fd);
+ }
#if __BYTE_ORDER == __LITTLE_ENDIAN
fmt = AFMT_S16_LE;
@@ -2181,7 +2182,7 @@
ast_channel_tech_set(c, &usbradio_tech);
if (o->sounddev < 0)
setformat(o, O_RDWR);
- c->fds[0] = o->sounddev; /* -1 if device closed, override later */
+ ast_channel_internal_fd_set(c, 0, o->sounddev);/* -1 if device closed, override later */
ast_format_cap_add(ast_channel_nativeformats(c), &slin);
ast_format_set(ast_channel_readformat(c), AST_FORMAT_SLINEAR, 0);
ast_format_set(ast_channel_writeformat(c), AST_FORMAT_SLINEAR, 0);
More information about the asterisk-commits
mailing list