Merge branch 'stable-1.1'

Conflicts:
	src/core/main.cpp
This commit is contained in:
Vesa committed 2014-11-16 22:22:48 +02:00
commit cd509b707b
12 files changed
+144 -151

No files matched your search

@@ -46,36 +46,21 @@ dynProcControls::dynProcControls( dynProcEffect * _eff ) :
m_wavegraphModel( 0.0f, 1.0f, 200, this ),
m_stereomodeModel( 0, 0, 2, this, tr( "Stereo mode" ) )
{
/* connect( &m_inputModel, SIGNAL( dataChanged() ),
this, SLOT( changeControl() ) );
connect( &m_outputModel, SIGNAL( dataChanged() ),
this, SLOT( changeControl() ) );
connect( &m_attackModel, SIGNAL( dataChanged() ),
this, SLOT( changeControl() ) );
connect( &m_releaseModel, SIGNAL( dataChanged() ),
this, SLOT( changeControl() ) );
connect( &m_stereomodeModel, SIGNAL( dataChanged() ),
this, SLOT( changeControl() ) );
*/
connect( &m_wavegraphModel, SIGNAL( samplesChanged( int, int ) ),
this, SLOT( samplesChanged( int, int ) ) );
connect( engine::mixer(), SIGNAL( sampleRateChanged() ), this, SLOT( sampleRateChanged() ) );
setDefaultShape();
}
void dynProcControls::changeControl()
void dynProcControls::sampleRateChanged()
{
// engine::getSong()->setModified();
m_effect->m_needsUpdate = true;
}
void dynProcControls::samplesChanged( int _begin, int _end)
{
engine::getSong()->setModified();