[svn-commits] russell: branch file/bridging r102298 - /team/file/bridging/bridges/
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Mon Feb 4 13:08:38 CST 2008
Author: russell
Date: Mon Feb 4 13:08:37 2008
New Revision: 102298
URL: http://svn.digium.com/view/asterisk?view=rev&rev=102298
Log:
spaces to tabs
Modified:
team/file/bridging/bridges/bridge_softmix.c
Modified: team/file/bridging/bridges/bridge_softmix.c
URL: http://svn.digium.com/view/asterisk/team/file/bridging/bridges/bridge_softmix.c?view=diff&rev=102298&r1=102297&r2=102298
==============================================================================
--- team/file/bridging/bridges/bridge_softmix.c (original)
+++ team/file/bridging/bridges/bridge_softmix.c Mon Feb 4 13:08:37 2008
@@ -108,9 +108,9 @@
{
struct softmix_channel *sc = bridge_channel->bridge_pvt;
- /* Only accept audio frames, all others are unsupported */
- if (frame->frametype != AST_FRAME_VOICE)
- return AST_BRIDGE_WRITE_UNSUPPORTED;
+ /* Only accept audio frames, all others are unsupported */
+ if (frame->frametype != AST_FRAME_VOICE)
+ return AST_BRIDGE_WRITE_UNSUPPORTED;
ast_mutex_lock(&sc->lock);
@@ -216,15 +216,15 @@
base = ast_tvadd(base, ast_tv(0, (SOFTMIX_INTERVAL*2)*1000));
}
- /* Calculate next time until we should wake up */
- next_wakeup = ast_tvadd(ast_tvnow(), ast_tvsub(base, ast_tvnow()));
-
- /* Apply this time to the timespec */
- ts.tv_sec = next_wakeup.tv_sec;
- ts.tv_nsec = next_wakeup.tv_usec * 1000;
-
- /* Wait until then */
- ast_cond_timedwait(&cond, &bridge->lock, &ts);
+ /* Calculate next time until we should wake up */
+ next_wakeup = ast_tvadd(ast_tvnow(), ast_tvsub(base, ast_tvnow()));
+
+ /* Apply this time to the timespec */
+ ts.tv_sec = next_wakeup.tv_sec;
+ ts.tv_nsec = next_wakeup.tv_usec * 1000;
+
+ /* Wait until then */
+ ast_cond_timedwait(&cond, &bridge->lock, &ts);
/* Before we calculate the skew value... record the previous one */
previous_skew = skew;
More information about the svn-commits
mailing list