[svn-commits] mmichelson: branch 1.6.0 r166274 - /branches/1.6.0/main/file.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Mon Dec 22 10:12:34 2008
New Revision: 166274

URL: http://svn.digium.com/view/asterisk?view=rev&rev=166274
Log:
Back these changes out for now. The initial refcounting
for filestreams didn't get merged into 1.6.0. I'll have
to get that in first and then put this change in


Modified:
    branches/1.6.0/main/file.c

Modified: branches/1.6.0/main/file.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/file.c?view=diff&rev=166274&r1=166273&r2=166274
==============================================================================
--- branches/1.6.0/main/file.c (original)
+++ branches/1.6.0/main/file.c Mon Dec 22 10:12:34 2008
@@ -659,10 +659,6 @@
 			goto return_failure;
 		
 		fr = s->fmt->read(s, &whennext);
-		if (fr) {
-			ast_set_flag(fr, AST_FRFLAG_FROM_FILESTREAM);
-			ao2_ref(s, +1);
-		}
 		if (!fr /* stream complete */ || ast_write(s->owner, fr) /* error writing */) {
 			if (fr)
 				ast_log(LOG_WARNING, "Failed to write frame\n");
@@ -719,10 +715,6 @@
 
 	while (!whennext) {
 		struct ast_frame *fr = s->fmt->read(s, &whennext);
-		if (fr) {
-			ast_set_flag(fr, AST_FRFLAG_FROM_FILESTREAM);
-			ao2_ref(s, +1);
-		}
 		if (!fr || ast_write(s->owner, fr)) { /* no stream or error, as above */
 			if (fr)
 				ast_log(LOG_WARNING, "Failed to write frame\n");