e1lama/stk
1
0
Fork 0
mirror of https://github.com/thestk/stk synced 2026-01-19 15:41:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Version 4.4.1

Browse Source
This commit is contained in:
Gary Scavone
2013-09-29 23:12:27 +02:00
committed by Stephen Sinclair
parent eccd8c9981
commit b6a2202011
16 changed files with 117 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Granulate.cpp
View File

@@ -260,7 +260,7 @@ StkFloat Granulate :: tick( unsigned int channel )
// Accumulate the grain outputs.
if ( grains_[i].state > 0 ) {
for ( j=0; j<nChannels; j++ ) {
sample = data_[ nChannels * grains_[i].pointer + j ];
sample = data_[ nChannels * grains_[i].pointer + j ];
if ( grains_[i].state == GRAIN_FADEIN || grains_[i].state == GRAIN_FADEOUT ) {
sample *= grains_[i].eScaler;

6
src/RtAudio.cpp
View File

@@ -38,7 +38,7 @@
*/
/************************************************************************/
// RtAudio: Version 4.0.5
// RtAudio: Version 4.0.6
#include "RtAudio.h"
#include <iostream>
@@ -403,7 +403,9 @@ unsigned int RtApi :: getStreamSampleRate( void )
// implementation.
struct CoreHandle {
AudioDeviceID id[2]; // device ids
#if defined( MAC_OS_X_VERSION_10_5 ) && ( MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 )
AudioDeviceIOProcID procId[2];
#endif
UInt32 iStream[2]; // device stream index (or first if using multiple)
UInt32 nStreams[2]; // number of streams to use
bool xrun[2];
@@ -5646,7 +5648,7 @@ bool RtApiAlsa :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigne
}
// Set the buffer number, which in ALSA is referred to as the "period".
int totalSize, dir;
int totalSize, dir = 0;
unsigned int periods = 0;
if ( options ) periods = options->numberOfBuffers;
totalSize = *bufferSize * periods;

4
src/RtMidi.cpp
View File

@@ -35,7 +35,7 @@
*/
/**********************************************************************/
// RtMidi: Version 1.0.9
// RtMidi: Version 1.0.10
#include "RtMidi.h"
#include <sstream>
@@ -743,7 +743,7 @@ void RtMidiOut :: sendMessage( std::vector<unsigned char> *message )
unsigned int packetBytes, bytesLeft = nBytes;
unsigned int messageIndex = 0;
MIDITimeStamp timeStamp = 0;
MIDITimeStamp timeStamp = AudioGetCurrentHostTime();
CoreMidiData *data = static_cast<CoreMidiData *> (apiData_);
while ( bytesLeft > 0 ) {

5
src/RtWvOut.cpp
View File

@@ -165,7 +165,7 @@ void RtWvOut :: tick( const StkFloat sample )
writeIndex_ = 0;
}
void RtWvOut :: tick( StkFrames& frames )
void RtWvOut :: tick( const StkFrames& frames )
{
#if defined(_STK_DEBUG_)
if ( data_.channels() != frames.channels() ) {
@@ -195,7 +195,8 @@ void RtWvOut :: tick( StkFrames& frames )
nFrames = frames.frames() - framesWritten;
bytes = nFrames * nChannels * sizeof( StkFloat );
StkFloat *samples = &data_[writeIndex_ * nChannels];
memcpy( samples, &frames[framesWritten * nChannels], bytes );
StkFrames *ins = (StkFrames *) &frames;
memcpy( samples, &(*ins)[framesWritten * nChannels], bytes );
for ( unsigned int i=0; i<nFrames * nChannels; i++ ) clipTest( *samples++ );
writeIndex_ += nFrames;