diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-29 17:50:44 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-29 17:50:44 +0000 |
| commit | 178cee50cf81adb1843d7c62146abe1bf7e751e9 (patch) | |
| tree | 618831e523571a05ffb2ca1af5dcf337a7cf04b8 /formats/format_ogg_vorbis.c | |
| parent | d59352983154648515c37cd1d3cd30a5fb7ab090 (diff) | |
Merged revisions 90155 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r90155 | tilghman | 2007-11-29 11:29:59 -0600 (Thu, 29 Nov 2007) | 5 lines
Use of "private" as a field name in a header file messes with C++ projects
Reported by: chewbacca
Patch by: casper
(Closes issue #11401)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@90158 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'formats/format_ogg_vorbis.c')
| -rw-r--r-- | formats/format_ogg_vorbis.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/formats/format_ogg_vorbis.c b/formats/format_ogg_vorbis.c index f5311bcdb..669e96a7d 100644 --- a/formats/format_ogg_vorbis.c +++ b/formats/format_ogg_vorbis.c @@ -85,7 +85,7 @@ static int ogg_vorbis_open(struct ast_filestream *s) int result; char **ptr; char *buffer; - struct vorbis_desc *tmp = (struct vorbis_desc *)s->private; + struct vorbis_desc *tmp = (struct vorbis_desc *)s->_private; tmp->writing = 0; @@ -195,7 +195,7 @@ static int ogg_vorbis_rewrite(struct ast_filestream *s, ogg_packet header; ogg_packet header_comm; ogg_packet header_code; - struct vorbis_desc *tmp = (struct vorbis_desc *)s->private; + struct vorbis_desc *tmp = (struct vorbis_desc *)s->_private; tmp->writing = 1; @@ -272,7 +272,7 @@ static int ogg_vorbis_write(struct ast_filestream *fs, struct ast_frame *f) int i; float **buffer; short *data; - struct vorbis_desc *s = (struct vorbis_desc *)fs->private; + struct vorbis_desc *s = (struct vorbis_desc *)fs->_private; if (!s->writing) { ast_log(LOG_ERROR, "This stream is not set up for writing!\n"); @@ -311,7 +311,7 @@ static int ogg_vorbis_write(struct ast_filestream *fs, struct ast_frame *f) */ static void ogg_vorbis_close(struct ast_filestream *fs) { - struct vorbis_desc *s = (struct vorbis_desc *)fs->private; + struct vorbis_desc *s = (struct vorbis_desc *)fs->_private; if (s->writing) { /* Tell the Vorbis encoder that the stream is finished @@ -343,7 +343,7 @@ static int read_samples(struct ast_filestream *fs, float ***pcm) int result; char *buffer; int bytes; - struct vorbis_desc *s = (struct vorbis_desc *)fs->private; + struct vorbis_desc *s = (struct vorbis_desc *)fs->_private; while (1) { samples_in = vorbis_synthesis_pcmout(&s->vd, pcm); @@ -426,7 +426,7 @@ static struct ast_frame *ogg_vorbis_read(struct ast_filestream *fs, int val; int samples_in; int samples_out = 0; - struct vorbis_desc *s = (struct vorbis_desc *)fs->private; + struct vorbis_desc *s = (struct vorbis_desc *)fs->_private; short *buf; /* SLIN data buffer */ fs->fr.frametype = AST_FRAME_VOICE; |