Merge branch 'stable-1.1'

Conflicts:
	src/core/NotePlayHandle.cpp
This commit is contained in:
Vesa
2014-07-17 02:06:01 +03:00
47 changed files with 611 additions and 280 deletions

View File

@@ -23,8 +23,8 @@
*
*/
#ifndef _EFFECT_H
#define _EFFECT_H
#ifndef EFFECT_H
#define EFFECT_H
#include "Plugin.h"
#include "engine.h"
@@ -118,8 +118,7 @@ public:
inline float gate() const
{
const float level = m_gateModel.value();
return level*level * m_processors *
engine::mixer()->framesPerPeriod();
return level*level * m_processors;
}
inline f_cnt_t bufferCount() const