Skip to content
Snippets Groups Projects
Commit 1681e18c authored by Mark Spencer's avatar Mark Spencer
Browse files

Version 0.2.0 from FTP

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@515 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent b26b0e95
No related branches found
No related tags found
No related merge requests found
......@@ -184,9 +184,12 @@ int ast_writestream(struct ast_filestream *fs, struct ast_frame *f)
res = 0;
/* Get the translated frame but don't consume the original in case they're using it on another stream */
trf = ast_translate(fs->trans, f, 0);
res = fs->fmt->write(fs, trf);
if (res)
ast_log(LOG_WARNING, "Translated frame write failed\n");
if (trf) {
res = fs->fmt->write(fs, trf);
if (res)
ast_log(LOG_WARNING, "Translated frame write failed\n");
} else
res = 0;
}
return res;
}
......@@ -547,6 +550,6 @@ char ast_waitstream(struct ast_channel *c, char *breakon)
}
return (c->softhangup ? -1 : 0);
return (c->_softhangup ? -1 : 0);
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment