[TTBlue-devel] [422] branches/active/source/units/TTAdsr.cpp: Making it so that the control rate tr
Status: Alpha
Brought to you by:
tap
From: <ti...@gr...> - 2008-05-17 18:34:16
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!-- #msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; } #msg dt { float: left; width: 6em; font-weight: bold; } #msg dt:after { content:':';} #msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: bold} #msg dl a:link { color:#fc3; } #msg dl a:active { color:#ff0; } #msg dl a:visited { color:#cc6; } h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; } #msg ul, pre { overflow: auto; } #header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; } #patch { width: 100%; } #patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;} #patch .propset h4, #patch .binary h4 {margin:0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;} #patch .propset .diff, #patch .binary .diff {padding:10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, .info {color:#888;background:#fff;} --></style> <title>[422] branches/active/source/units/TTAdsr.cpp: Making it so that the control rate trigger works again.</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>422</dd> <dt>Author</dt> <dd>tim</dd> <dt>Date</dt> <dd>2008-05-17 18:34:19 +0000 (Sat, 17 May 2008)</dd> </dl> <h3>Log Message</h3> <pre>Making it so that the control rate trigger works again.</pre> <h3>Modified Paths</h3> <ul> <li><a href="#branchesactivesourceunitsTTAdsrcpp">branches/active/source/units/TTAdsr.cpp</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="branchesactivesourceunitsTTAdsrcpp"></a> <div class="modfile"><h4>Modified: branches/active/source/units/TTAdsr.cpp (421 => 422)</h4> <pre class="diff"><span> <span class="info">--- branches/active/source/units/TTAdsr.cpp 2008-05-17 17:43:38 UTC (rev 421) +++ branches/active/source/units/TTAdsr.cpp 2008-05-17 18:34:19 UTC (rev 422) </span><span class="lines">@@ -136,13 +136,23 @@ </span><span class="cx"> </span><span class="cx"> TTErr TTAdsr::processAudio(TTAudioSignal& in, TTAudioSignal& out) </span><span class="cx"> { </span><del>- TTSampleValue *inSample, *outSample; - short vs = in.getVectorSize(); </del><ins>+ TTSampleValue* inSample; + TTSampleValue* outSample; + TTUInt16 vs = in.getVectorSize(); + bool checkAudioTrigger = false; </ins><span class="cx"> </span><ins>+ // If the two signals are the same instance, then we know that only an output signal has been passed + // So in that case we use the control-rate trigger instead of an audio-rate trigger. + // TODO: Is there a decent way to do this without having to check this every single vector? + if(&in != &out) + checkAudioTrigger = true; + </ins><span class="cx"> inSample = in.sampleVectors[0]; </span><span class="cx"> outSample = out.sampleVectors[0]; </span><ins>+ </ins><span class="cx"> while(vs--) { </span><del>- trigger = (TTBoolean)(*inSample++ > 0.5); </del><ins>+ if(checkAudioTrigger) + trigger = (TTBoolean)(*inSample++ > 0.5); </ins><span class="cx"> </span><span class="cx"> if(trigger) { </span><span class="cx"> if(eg_state == k_eg_inactive || eg_state == k_eg_release) </span><span class="lines">@@ -182,6 +192,5 @@ </span><span class="cx"> *outSample++ = output; </span><span class="cx"> } </span><span class="cx"> </span><del>- </del><span class="cx"> return kTTErrNone; </span><span class="cx"> } </span></span></pre> </div> </div> </body> </html> |