e1lama/stk
1
0
Fork 0
mirror of https://github.com/thestk/stk synced 2026-04-23 23:58:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

ADSR fix for decay/release time calculations; FileRead variable size fixes and argument check.

Browse Source
This commit is contained in:
Gary Scavone
2014-03-12 13:27:05 -04:00
parent 1874c0efa9
commit 0e7077c0f3
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ADSR.cpp
View File

@@ -149,8 +149,8 @@ void ADSR :: setReleaseTime( StkFloat time )
void ADSR :: setAllTimes( StkFloat aTime, StkFloat dTime, StkFloat sLevel, StkFloat rTime ) void ADSR :: setAllTimes( StkFloat aTime, StkFloat dTime, StkFloat sLevel, StkFloat rTime )
{ {
this->setAttackTime( aTime ); this->setAttackTime( aTime );
this->setDecayTime( dTime );
this->setSustainLevel( sLevel ); this->setSustainLevel( sLevel );
this->setDecayTime( dTime );
this->setReleaseTime( rTime ); this->setReleaseTime( rTime );
} }

11
src/FileRead.cpp
View File

@@ -571,7 +571,7 @@ bool FileRead :: getMatInfo( const char *fileName )
bool doneParsing, haveData, haveSampleRate; bool doneParsing, haveData, haveSampleRate;
SINT32 chunkSize, rows, columns, nametype; SINT32 chunkSize, rows, columns, nametype;
int dataoffset; long dataoffset;
doneParsing = false; doneParsing = false;
haveData = false; haveData = false;
haveSampleRate = false; haveSampleRate = false;
@@ -734,7 +734,7 @@ void FileRead :: read( StkFrames& buffer, unsigned long startFrame, bool doNorma
} }
// Check the buffer size. // Check the buffer size.
unsigned int nFrames = buffer.frames(); unsigned long nFrames = buffer.frames();
if ( nFrames == 0 ) { if ( nFrames == 0 ) {
oStream_ << "FileRead::read: StkFrames buffer size is zero ... no data read!"; oStream_ << "FileRead::read: StkFrames buffer size is zero ... no data read!";
Stk::handleError( StkError::WARNING ); return; Stk::handleError( StkError::WARNING ); return;
@@ -745,8 +745,13 @@ void FileRead :: read( StkFrames& buffer, unsigned long startFrame, bool doNorma
Stk::handleError( StkError::FUNCTION_ARGUMENT ); Stk::handleError( StkError::FUNCTION_ARGUMENT );
} }
if ( startFrame >= fileSize_ ) {
oStream_ << "FileRead::read: startFrame argument is greater than or equal to the file size!";
Stk::handleError( StkError::FUNCTION_ARGUMENT );
}
// Check for file end. // Check for file end.
if ( startFrame + nFrames >= fileSize_ ) if ( startFrame + nFrames > fileSize_ )
nFrames = fileSize_ - startFrame; nFrames = fileSize_ - startFrame;
long i, nSamples = (long) ( nFrames * channels_ ); long i, nSamples = (long) ( nFrames * channels_ );