commit 134f9ac742ee5da00e839b9e23a6a42c5b450f85
parent ea47ceac711f4ca5709694474859e9340992c5d8
Author: fundamental <mark.d.mccurry@gmail.com>
Date: Sat, 12 Jun 2010 13:19:11 -0400
Nio: Fixing Compiler warnings
Diffstat:
3 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/src/Nio/AudioOut.cpp b/src/Nio/AudioOut.cpp
@@ -53,18 +53,6 @@ void AudioOut::setBufferSize(int _bufferSize)
bufferSize = _bufferSize;
}
-//delete me
-void AudioOut::bufferingSize(int nBuffering)
-{
- //buffering = nBuffering;
-}
-
-//delete me
-int AudioOut::bufferingSize()
-{
- //return buffering;
-}
-
const Stereo<REALTYPE *> AudioOut::getNext()
{
return OutMgr::getInstance().tick(bufferSize);
diff --git a/src/Nio/OutMgr.cpp b/src/Nio/OutMgr.cpp
@@ -137,14 +137,13 @@ void OutMgr::addSmps(REALTYPE *l, REALTYPE *r)
void OutMgr::removeStaleSmps()
{
- int toShift = storedSmps() - stales;
if(!stales)
return;
+ //memset is possibly unneeded
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);
- 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*/