From 22ab8ce80baa3ea57e325a759d7488d4d5b3dd63 Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Fri, 27 Mar 2009 14:22:25 +0000 Subject: [PATCH] Merged revisions 184639 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r184639 | file | 2009-03-27 11:18:40 -0300 (Fri, 27 Mar 2009) | 2 lines Remove a cast that is not needed. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@184650 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- bridges/bridge_softmix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c index 73ac296604..953dbb45af 100644 --- a/bridges/bridge_softmix.c +++ b/bridges/bridge_softmix.c @@ -199,7 +199,7 @@ static int softmix_bridge_poke(struct ast_bridge *bridge, struct ast_bridge_chan /*! \brief Function which acts as the mixing thread */ static int softmix_bridge_thread(struct ast_bridge *bridge) { - int timingfd = (unsigned short)(unsigned long)bridge->bridge_pvt; + int timingfd = (unsigned long)bridge->bridge_pvt; ast_timer_set_rate(timingfd, (1000 / SOFTMIX_INTERVAL));