Merge branch 'stable-1.1'

Conflicts:
	.travis.yml
	CMakeLists.txt
	plugins/stk/mallets/mallets.cpp
	plugins/vst_base/CMakeLists.txt
This commit is contained in:
Vesa
2015-04-26 16:59:01 +03:00
7 changed files with 22 additions and 9 deletions

View File

@@ -98,8 +98,8 @@ inline void FxChannel::processed()
void FxChannel::incrementDeps()
{
m_dependenciesMet.ref();
if( m_dependenciesMet >= m_receives.size() && ! m_queued )
int i = m_dependenciesMet.fetchAndAddOrdered( 1 ) + 1;
if( i >= m_receives.size() && ! m_queued )
{
m_queued = true;
MixerWorkerThread::addJob( this );