commit d97deef0132db03d554ecaf9bd974e8caa0a443d
parent 63aaf28d2aa4276348db38e49bee100595789229
Author: fundamental <mark.d.mccurry@gmail.com>
Date: Sun, 27 Jun 2010 16:21:34 -0400
Merge branch 'release'
Conflicts:
src/Effects/Makefile
src/Misc/Util.cpp
src/UI/MasterUI.fl
Diffstat:
11 files changed, 33 insertions(+), 31 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -996,3 +996,5 @@
02 May 2010 (Mark McCurry)
- Merging in cleanup from effects and adding APhaser by Ryan Billing
+27 Jun 2010 (Mark McCurry)
+ - Aphaser and Phaser are within same effect now
diff --git a/HISTORY.txt b/HISTORY.txt
@@ -1,4 +1,4 @@
-2.4.1 (22 May 2010)
+2.4.1 (27 Jun 2010)
- Azerty layout
- XML bug fixes
- Vibrato/Unison additions
diff --git a/src/Effects/DynamicFilter.cpp b/src/Effects/DynamicFilter.cpp
@@ -60,7 +60,7 @@ void DynamicFilter::out(const Stereo<float *> &smp)
const REALTYPE freq = filterpars->getfreq();
const REALTYPE q = filterpars->getq();
- for(i = 0; i < SOUND_BUFFER_SIZE; i++) {
+ for(int i = 0; i < SOUND_BUFFER_SIZE; i++) {
efxoutl[i] = smp.l[i];
efxoutr[i] = smp.r[i];
diff --git a/src/Effects/Reverb.cpp b/src/Effects/Reverb.cpp
@@ -163,7 +163,7 @@ void Reverb::out(const Stereo<float *> &smp)
if((Pvolume == 0) && (insertion != 0))
return;
- for(i = 0; i < SOUND_BUFFER_SIZE; i++)
+ for(int i = 0; i < SOUND_BUFFER_SIZE; i++)
inputbuf[i] = (smp.l[i] + smp.r[i]) / 2.0;
if(idelay != NULL) {
diff --git a/src/Nio/AlsaEngine.cpp b/src/Nio/AlsaEngine.cpp
@@ -239,9 +239,9 @@ const short *AlsaEngine::interleave(const Stereo<REALTYPE *> smps)const
double scaled;
for (int frame = 0; frame < bufferSize; ++frame)
{ // with a nod to libsamplerate ...
- scaled = smps.l()[frame] * (8.0 * 0x10000000);
+ scaled = smps.l[frame] * (8.0 * 0x10000000);
shortInterleaved[idx++] = (short int)(lrint(scaled) >> 16);
- scaled = smps.r()[frame] * (8.0 * 0x10000000);
+ scaled = smps.r[frame] * (8.0 * 0x10000000);
shortInterleaved[idx++] = (short int)(lrint(scaled) >> 16);
}
return shortInterleaved;
diff --git a/src/Nio/JackEngine.cpp b/src/Nio/JackEngine.cpp
@@ -261,9 +261,9 @@ bool JackEngine::processAudio(jack_nframes_t nframes)
Stereo<REALTYPE *> smp = getNext();
- //Assumes smp.l().size() == nframes
- memcpy(audio.portBuffs[0], smp.l(), bufferSize*sizeof(REALTYPE));
- memcpy(audio.portBuffs[1], smp.r(), bufferSize*sizeof(REALTYPE));
+ //Assumes size of smp.l == nframes
+ memcpy(audio.portBuffs[0], smp.l, bufferSize*sizeof(REALTYPE));
+ memcpy(audio.portBuffs[1], smp.r, bufferSize*sizeof(REALTYPE));
handleMidi(nframes);
return true;
diff --git a/src/Nio/OssEngine.cpp b/src/Nio/OssEngine.cpp
@@ -213,8 +213,8 @@ void *OssEngine::thread()
REALTYPE l, r;
for(int i = 0; i < SOUND_BUFFER_SIZE; i++) {
- l = smps.l()[i];
- r = smps.r()[i];
+ l = smps.l[i];
+ r = smps.r[i];
if(l < -1.0)
l = -1.0;
diff --git a/src/Nio/OutMgr.cpp b/src/Nio/OutMgr.cpp
@@ -33,8 +33,8 @@ OutMgr::OutMgr()
OutMgr::~OutMgr()
{
delete wave;
- delete [] priBuf.l();
- delete [] priBuf.r();
+ delete [] priBuf.l;
+ delete [] priBuf.r;
delete [] outr;
delete [] outl;
}
@@ -64,8 +64,8 @@ const Stereo<REALTYPE *> OutMgr::tick(unsigned int frameSize)
addSmps(outl,outr);
}
Stereo<REALTYPE *> ans = priBuffCurrent;
- ans.l() -= frameSize;
- ans.r() -= frameSize;
+ ans.l -= frameSize;
+ ans.r -= frameSize;
//cout << storedSmps() << '=' << frameSize << endl;
return priBuf;
}
@@ -121,17 +121,17 @@ void OutMgr::addSmps(REALTYPE *l, REALTYPE *r)
if(currentOut->getSampleRate() != SAMPLE_RATE) { //we need to resample
//cout << "BAD RESAMPLING" << endl;
Stereo<Sample> smps(Sample(SOUND_BUFFER_SIZE, l), Sample(SOUND_BUFFER_SIZE, r));
- smps.l().resample(SAMPLE_RATE,currentOut->getSampleRate());
- smps.r().resample(SAMPLE_RATE,currentOut->getSampleRate());
- memcpy(priBuffCurrent.l(), smps.l().c_buf(), SOUND_BUFFER_SIZE*sizeof(REALTYPE));
- memcpy(priBuffCurrent.r(), smps.r().c_buf(), SOUND_BUFFER_SIZE*sizeof(REALTYPE));
+ smps.l.resample(SAMPLE_RATE,currentOut->getSampleRate());
+ smps.r.resample(SAMPLE_RATE,currentOut->getSampleRate());
+ memcpy(priBuffCurrent.l, smps.l.c_buf(), SOUND_BUFFER_SIZE*sizeof(REALTYPE));
+ memcpy(priBuffCurrent.r, smps.r.c_buf(), SOUND_BUFFER_SIZE*sizeof(REALTYPE));
}
else { //just copy the samples
- memcpy(priBuffCurrent.l(), l, SOUND_BUFFER_SIZE*sizeof(REALTYPE));
- memcpy(priBuffCurrent.r(), r, SOUND_BUFFER_SIZE*sizeof(REALTYPE));
+ memcpy(priBuffCurrent.l, l, SOUND_BUFFER_SIZE*sizeof(REALTYPE));
+ memcpy(priBuffCurrent.r, r, SOUND_BUFFER_SIZE*sizeof(REALTYPE));
}
- priBuffCurrent.l() += SOUND_BUFFER_SIZE;
- priBuffCurrent.r() += SOUND_BUFFER_SIZE;
+ priBuffCurrent.l += SOUND_BUFFER_SIZE;
+ priBuffCurrent.r += SOUND_BUFFER_SIZE;
stales += SOUND_BUFFER_SIZE;
}
@@ -141,8 +141,8 @@ void OutMgr::removeStaleSmps()
return;
//memset is possibly unneeded
- memset(priBuf.l(), '0', 4096*sizeof(REALTYPE));
- memset(priBuf.r(), '0', 4096*sizeof(REALTYPE));
+ memset(priBuf.l, '0', 4096*sizeof(REALTYPE));
+ memset(priBuf.r, '0', 4096*sizeof(REALTYPE));
priBuffCurrent = priBuf;
stales = 0;
}
diff --git a/src/Nio/OutMgr.h b/src/Nio/OutMgr.h
@@ -45,7 +45,7 @@ class OutMgr
private:
OutMgr();
void addSmps(REALTYPE *l, REALTYPE *r);
- unsigned int storedSmps() const {return priBuffCurrent.l() - priBuf.l();};
+ unsigned int storedSmps() const {return priBuffCurrent.l - priBuf.l;};
void removeStaleSmps();
AudioOut *currentOut;/**<The current output driver*/
diff --git a/src/Nio/PaEngine.cpp b/src/Nio/PaEngine.cpp
@@ -85,13 +85,13 @@ int PaEngine::process(float *out, unsigned long framesPerBuffer)
const Stereo<REALTYPE *> smp = getNext();
- //if(framesPerBuffer != smp.l().size())
+ //if(framesPerBuffer != smp.l.size())
// cerr << "Bug: PaEngine::process SOUND_BUFFER_SIZE!=framesPerBuffer"
- // << framesPerBuffer << ' ' << smp.l().size() << endl;
+ // << framesPerBuffer << ' ' << smp.l.size() << endl;
for(int i = 0; i < framesPerBuffer; i++) {
- *out++ = smp.l()[i];
- *out++ = smp.r()[i];
+ *out++ = smp.l[i];
+ *out++ = smp.r[i];
}
return 0;
diff --git a/src/Nio/WavEngine.cpp b/src/Nio/WavEngine.cpp
@@ -78,8 +78,8 @@ void WavEngine::push(Stereo<REALTYPE *> smps, size_t len)
//copy the input [overflow when needed]
for(size_t i = 0; i < len; ++i) {
- buffer.push(*smps.l()++);
- buffer.push(*smps.r()++);
+ buffer.push(*smps.l++);
+ buffer.push(*smps.r++);
}
sem_post(&work);
}
