[asterisk-commits] twilson: trunk r357999 - in /trunk: ./ channels/xpmr/xpmr.c

[SVN commits to the Asterisk project]

Author: twilson
Date: Fri Mar  2 16:36:28 2012
New Revision: 357999

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=357999
Log:
Make chan_usbradio compile under dev mode

x=++x and x=x=1? Really?
........

Merged revisions 357986 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 357987 from http://svn.asterisk.org/svn/asterisk/branches/10

Modified:
    trunk/   (props changed)
    trunk/channels/xpmr/xpmr.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/channels/xpmr/xpmr.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/xpmr/xpmr.c?view=diff&rev=357999&r1=357998&r2=357999
==============================================================================
--- trunk/channels/xpmr/xpmr.c (original)
+++ trunk/channels/xpmr/xpmr.c Fri Mar  2 16:36:28 2012
@@ -1555,7 +1555,7 @@
 			}
 			#endif
 			indexWas=indexNow;
-			ptdet->zIndex=(++ptdet->zIndex)%4;
+			ptdet->zIndex=(ptdet->zIndex + 1) % 4;
 		}
 		ptdet->counter-=(points2do*CTCSS_SCOUNT_MUL);
 
@@ -2019,7 +2019,7 @@
 	pSps->sigProc=pmr_rx_frontend;
 	pSps->enabled=1;
 	pSps->decimator=pSps->decimate=6;
-	pSps->interpolate=pSps->interpolate=1;
+	pSps->interpolate=1;
 	pSps->nSamples=pChan->nSamplesRx;
 	pSps->ncoef=taps_fir_bpf_noise_1;
 	pSps->size_coef=2;