Merge pull request #965 from LMMS/stable-1.1

Stable 1.1
This commit is contained in:
Vesa V
2014-07-10 12:42:42 +03:00
3 changed files with 11 additions and 11 deletions

View File

@@ -40,10 +40,10 @@ AmplifierControls::AmplifierControls( AmplifierEffect* effect ) :
m_leftModel( 100.0f, 0.0f, 200.0f, 0.1f, this, tr( "Left gain" ) ),
m_rightModel( 100.0f, 0.0f, 200.0f, 0.1f, this, tr( "Right gain" ) )
{
connect( &m_volumeModel, SIGNAL( dataChanged() ), this, SLOT( changeControl() ) );
/* connect( &m_volumeModel, SIGNAL( dataChanged() ), this, SLOT( changeControl() ) );
connect( &m_panModel, SIGNAL( dataChanged() ), this, SLOT( changeControl() ) );
connect( &m_leftModel, SIGNAL( dataChanged() ), this, SLOT( changeControl() ) );
connect( &m_rightModel, SIGNAL( dataChanged() ), this, SLOT( changeControl() ) );
connect( &m_rightModel, SIGNAL( dataChanged() ), this, SLOT( changeControl() ) );*/
}
@@ -51,7 +51,7 @@ AmplifierControls::AmplifierControls( AmplifierEffect* effect ) :
void AmplifierControls::changeControl()
{
engine::getSong()->setModified();
// engine::getSong()->setModified();
}

View File

@@ -45,7 +45,7 @@ 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() ),
/* connect( &m_inputModel, SIGNAL( dataChanged() ),
this, SLOT( changeControl() ) );
connect( &m_outputModel, SIGNAL( dataChanged() ),
@@ -59,7 +59,7 @@ dynProcControls::dynProcControls( dynProcEffect * _eff ) :
connect( &m_stereomodeModel, SIGNAL( dataChanged() ),
this, SLOT( changeControl() ) );
*/
connect( &m_wavegraphModel, SIGNAL( samplesChanged( int, int ) ),
this, SLOT( samplesChanged( int, int ) ) );
@@ -72,7 +72,7 @@ dynProcControls::dynProcControls( dynProcEffect * _eff ) :
void dynProcControls::changeControl()
{
engine::getSong()->setModified();
// engine::getSong()->setModified();
}
void dynProcControls::samplesChanged( int _begin, int _end)

View File

@@ -43,7 +43,7 @@ waveShaperControls::waveShaperControls( waveShaperEffect * _eff ) :
m_wavegraphModel( 0.0f, 1.0f, 200, this ),
m_clipModel( false, this )
{
connect( &m_inputModel, SIGNAL( dataChanged() ),
/* connect( &m_inputModel, SIGNAL( dataChanged() ),
this, SLOT( changeInput() ) );
connect( &m_outputModel, SIGNAL( dataChanged() ),
@@ -51,7 +51,7 @@ waveShaperControls::waveShaperControls( waveShaperEffect * _eff ) :
connect( &m_clipModel, SIGNAL( dataChanged() ),
this, SLOT( changeClip() ) );
*/
connect( &m_wavegraphModel, SIGNAL( samplesChanged( int, int ) ),
this, SLOT( samplesChanged( int, int ) ) );
@@ -64,17 +64,17 @@ waveShaperControls::waveShaperControls( waveShaperEffect * _eff ) :
void waveShaperControls::changeInput()
{
engine::getSong()->setModified();
// engine::getSong()->setModified();
}
void waveShaperControls::changeOutput()
{
engine::getSong()->setModified();
// engine::getSong()->setModified();
}
void waveShaperControls::changeClip()
{
engine::getSong()->setModified();
// engine::getSong()->setModified();
}
void waveShaperControls::samplesChanged( int _begin, int _end)