summaryrefslogtreecommitdiff
path: root/sms/analysis.c
diff options
context:
space:
mode:
authorJohn Glover <john@john-glovers-macbook.local>2010-12-30 18:45:16 +0000
committerJohn Glover <john@john-glovers-macbook.local>2010-12-30 18:45:16 +0000
commit9214a933be3caff80eec7a19d04fd309c3a35388 (patch)
tree87d98e6af862043f689145b9f257876b040fe4d6 /sms/analysis.c
parent8f29130d9c2612a7e7867458cae71dbb73b51aeb (diff)
downloadsimpl-9214a933be3caff80eec7a19d04fd309c3a35388.tar.gz
simpl-9214a933be3caff80eec7a19d04fd309c3a35388.tar.bz2
simpl-9214a933be3caff80eec7a19d04fd309c3a35388.zip
Code tidying
Diffstat (limited to 'sms/analysis.c')
-rw-r--r--sms/analysis.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sms/analysis.c b/sms/analysis.c
index efd98f4..ad8420e 100644
--- a/sms/analysis.c
+++ b/sms/analysis.c
@@ -517,8 +517,7 @@ int sms_analyze(int sizeWaveform, sfloat *pWaveform, SMS_Data *pSmsData, SMS_Ana
{
pSmsData->pFSinFreq[i] = pAnalParams->ppFrames[iCurrentFrame]->pSpectralPeaks[i].fFreq;
pSmsData->pFSinAmp[i] = sms_dBToMag(pAnalParams->ppFrames[iCurrentFrame]->pSpectralPeaks[i].fMag);
- if(pAnalParams->iFormat == SMS_FORMAT_HP ||
- pAnalParams->iFormat == SMS_FORMAT_IHP)
+ if(pAnalParams->iFormat == SMS_FORMAT_HP || pAnalParams->iFormat == SMS_FORMAT_IHP)
{
pSmsData->pFSinPha[i] = pAnalParams->ppFrames[iCurrentFrame]->pSpectralPeaks[i].fPhase;
}
@@ -538,8 +537,7 @@ int sms_analyze(int sizeWaveform, sfloat *pWaveform, SMS_Data *pSmsData, SMS_Ana
/* convert mags back to linear */
sms_arrayDBToMag(pSmsData->nTracks, pSmsData->pFSinAmp);
- if(pAnalParams->iFormat == SMS_FORMAT_HP ||
- pAnalParams->iFormat == SMS_FORMAT_IHP)
+ if(pAnalParams->iFormat == SMS_FORMAT_HP || pAnalParams->iFormat == SMS_FORMAT_IHP)
memcpy((char *) pSmsData->pFSinPha, (char *)
pAnalParams->ppFrames[0]->deterministic.pFSinPha, length);