[svn-commits] tilghman: trunk r491 - in /trunk: ./ format_mp3/format_mp3.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Thu Nov 29 17:50:45 2007
New Revision: 491

URL: http://svn.digium.com/view/asterisk-addons?view=rev&rev=491
Log:
Merged revisions 490 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-addons/branches/1.4

........
r490 | tilghman | 2007-11-29 17:47:53 -0600 (Thu, 29 Nov 2007) | 2 lines

Track API change (Closes issue #11401)

........

Modified:
    trunk/   (props changed)
    trunk/format_mp3/format_mp3.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Thu Nov 29 17:50:45 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-299,308,310,317,319,329,342,348,358,380,382,387,389,398,405,410,414,417,423,428,466,472,475,479,485
+/branches/1.4:1-299,308,310,317,319,329,342,348,358,380,382,387,389,398,405,410,414,417,423,428,466,472,475,479,485,490

Modified: trunk/format_mp3/format_mp3.c
URL: http://svn.digium.com/view/asterisk-addons/trunk/format_mp3/format_mp3.c?view=diff&rev=491&r1=490&r2=491
==============================================================================
--- trunk/format_mp3/format_mp3.c (original)
+++ trunk/format_mp3/format_mp3.c Thu Nov 29 17:50:45 2007
@@ -95,7 +95,7 @@
 
 static int mp3_open(struct ast_filestream *s)
 {
-	struct mp3_private *p = s->private;
+	struct mp3_private *p = s->_private;
 	
 	InitMP3(&p->mp, OUTSCALE);
 	p->dbuflen = 0;
@@ -112,7 +112,7 @@
 
 static void mp3_close(struct ast_filestream *s)
 {
-	struct mp3_private *p = s->private;
+	struct mp3_private *p = s->_private;
 	
 	ExitMP3(&p->mp);
 	return;
@@ -120,7 +120,7 @@
 
 static int mp3_squeue(struct ast_filestream *s) 
 {
-	struct mp3_private *p = s->private;
+	struct mp3_private *p = s->_private;
 	int res=0;
 	
 	p->lastseek = ftell(s->f);
@@ -139,7 +139,7 @@
 
 static int mp3_dqueue(struct ast_filestream *s) 
 {
-	struct mp3_private *p = s->private;
+	struct mp3_private *p = s->_private;
 	int res=0;
 	
 	if((res = decodeMP3(&p->mp,NULL,0,p->dbuf,MP3_DCACHE,&p->dbuflen)) == MP3_OK) {
@@ -151,7 +151,7 @@
 
 static int mp3_queue(struct ast_filestream *s)
 {
-	struct mp3_private *p = s->private;
+	struct mp3_private *p = s->_private;
 	int res = 0, bytes = 0;
 	
 	if(p->seek) {
@@ -196,7 +196,7 @@
 static struct ast_frame *mp3_read(struct ast_filestream *s, int *whennext)
 {
 
-	struct mp3_private *p = s->private;
+	struct mp3_private *p = s->_private;
 	int delay =0;
 	int save=0;
 
@@ -252,7 +252,7 @@
 
 static int mp3_seek(struct ast_filestream *s, off_t sample_offset, int whence)
 {
-	struct mp3_private *p = s->private;
+	struct mp3_private *p = s->_private;
 	off_t min,max,cur;
 	long offset=0,samples;
 	samples = sample_offset * 2;
@@ -292,7 +292,7 @@
 
 static off_t mp3_tell(struct ast_filestream *s)
 {
-	struct mp3_private *p = s->private;
+	struct mp3_private *p = s->_private;
 	
 	return p->offset/2;
 }