cml/libcm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmProc3.h : Added equal power cross fade to XFader object.

Browse Source
This commit is contained in:
kevin 2013-11-01 18:30:40 -07:00
parent af7328e4d7
commit fadafa8e6b
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmProc3.c
View File

@ -2055,10 +2055,14 @@ cmRC_t cmXfaderExec( cmXfader* p, unsigned procSmpCnt, const bool* chGateV,
cmReal_t g = cp->gain; cmReal_t g = cp->gain;
if( cp->gateFl ) if( cp->gateFl )
{
cp->gain = cmMin(cp->gain + i_dgain,1.0); cp->gain = cmMin(cp->gain + i_dgain,1.0);
cp->ep_gain = sqrt(0.5 + 0.5 * cos(3.14159*cp->gain));
}
else else
{ {
cp->gain = cmMax(cp->gain - o_dgain,0.0); cp->gain = cmMax(cp->gain - o_dgain,0.0);
cp->ep_gain = sqrt(0.5 - 0.5 * cos(3.14159*cp->gain));
cp->offFl = g>0.0 && cp->gain==0.0; // notice fade-out transition end cp->offFl = g>0.0 && cp->gain==0.0; // notice fade-out transition end
} }
@ -2094,7 +2098,7 @@ cmRC_t cmXfaderExecAudio( cmXfader* p, unsigned procSmpCnt, const bool* gateV
unsigned i; unsigned i;
for(i=0; i<chCnt; ++i) for(i=0; i<chCnt; ++i)
if( x[i] != NULL ) if( x[i] != NULL )
cmVOS_MultVaVS(y,procSmpCnt,x[i],p->chArray[i].gain); cmVOS_MultVaVS(y,procSmpCnt,x[i],p->chArray[i].ep_gain);
return rc; return rc;
} }

1
cmProc3.h
View File

@ -299,6 +299,7 @@ extern "C" {
// to the audio signal - unless you use cmXfaderExecAudio() // to the audio signal - unless you use cmXfaderExecAudio()
typedef struct typedef struct
{ {
cmReal_t ep_gain;
cmReal_t gain; cmReal_t gain;
bool gateFl; // true if channel is on bool gateFl; // true if channel is on
bool onFl; // true if gateFl transitioned to true on this cycle bool onFl; // true if gateFl transitioned to true on this cycle