mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-02-05 12:13:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #487 from diizy/stable-0.4

Browse Source 
Dual Filter fix: make more efficient -  don't calculate coefficients unn...
This commit is contained in:
Tobias Doerffel
2014-03-19 07:42:39 +01:00
parent 41c154dc95 34ba29cfcd
commit 376765526a
6 changed files with 51 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/lmms
View File

@@ -1,4 +1,4 @@
?package(lmms):needs="X11" section="Apps/Sound" \
title="LMMS" hints="Audio" command="/usr/bin/lmms" \
longtitle="Linux MultiMedia Studio" \
longtitle="LMMS" \
icon="/usr/share/pixmaps/lmms.png"

2
data/lmms.desktop
View File

@@ -1,5 +1,5 @@
[Desktop Entry]
Name=Linux MultiMedia Studio
Name=LMMS
GenericName=music production suite
GenericName[ca]=Programari de producció musical
GenericName[de]=Software zur Musik-Produktion

27
plugins/DualFilter/DualFilter.cpp
View File

@@ -55,6 +55,10 @@ DualFilterEffect::DualFilterEffect( Model* parent, const Descriptor::SubPluginFe
{
m_filter1 = new basicFilters<2>( engine::mixer()->processingSampleRate() );
m_filter2 = new basicFilters<2>( engine::mixer()->processingSampleRate() );
// ensure filters get updated
m_filter1changed = true;
m_filter2changed = true;
}
@@ -82,10 +86,23 @@ bool DualFilterEffect::processAudioBuffer( sampleFrame* buf, const fpp_t frames
m_filter1->setFilterType( m_dfControls.m_filter1Model.value() );
m_filter2->setFilterType( m_dfControls.m_filter2Model.value() );
const bool enabled1 = m_dfControls.m_enabled1Model.value();
const bool enabled2 = m_dfControls.m_enabled2Model.value();
if( m_dfControls.m_enabled1Model.value() ) m_filter1->calcFilterCoeffs( m_dfControls.m_cut1Model.value(), m_dfControls.m_res1Model.value() );
if( m_dfControls.m_enabled2Model.value() ) m_filter2->calcFilterCoeffs( m_dfControls.m_cut2Model.value(), m_dfControls.m_res2Model.value() );
// recalculate only when necessary
if( enabled1 && m_filter1changed )
{
m_filter1->calcFilterCoeffs( m_dfControls.m_cut1Model.value(), m_dfControls.m_res1Model.value() );
m_filter1changed = false;
}
if( enabled2 && m_filter2changed )
{
m_filter2->calcFilterCoeffs( m_dfControls.m_cut2Model.value(), m_dfControls.m_res2Model.value() );
m_filter2changed = false;
}
// buffer processing loop
for( fpp_t f = 0; f < frames; ++f )
{
@@ -98,7 +115,7 @@ bool DualFilterEffect::processAudioBuffer( sampleFrame* buf, const fpp_t frames
const float mix2 = ( ( m_dfControls.m_mixModel.value( f ) + 1.0f ) / 2.0f );
// update filter 1
if( m_dfControls.m_enabled1Model.value() )
if( enabled1 )
{
s1[0] = m_filter1->update( s1[0], 0 );
s1[1] = m_filter1->update( s1[1], 1 );
@@ -113,7 +130,7 @@ bool DualFilterEffect::processAudioBuffer( sampleFrame* buf, const fpp_t frames
}
// update filter 2
if( m_dfControls.m_enabled2Model.value() )
if( enabled2 )
{
s2[0] = m_filter2->update( s2[0], 0 );
s2[1] = m_filter2->update( s2[1], 1 );
@@ -140,6 +157,8 @@ bool DualFilterEffect::processAudioBuffer( sampleFrame* buf, const fpp_t frames
extern "C"
{

4
plugins/DualFilter/DualFilter.h
View File

@@ -43,11 +43,15 @@ public:
return &m_dfControls;
}
private:
DualFilterControls m_dfControls;
basicFilters<2> * m_filter1;
basicFilters<2> * m_filter2;
bool m_filter1changed;
bool m_filter2changed;
friend class DualFilterControls;

35
plugins/DualFilter/DualFilterControls.cpp
View File

@@ -51,19 +51,13 @@ DualFilterControls::DualFilterControls( DualFilterEffect* effect ) :
m_res2Model( 0.5, basicFilters<0>::minQ(), 10.0, 0.01, this, tr( "Q/Resonance 2" ) ),
m_gain2Model( 100.0f, 0.0f, 200.0f, 0.1f, this, tr( "Gain 2" ) )
{
connect( &m_enabled1Model, SIGNAL( dataChanged() ), this, SLOT( changeControl() ) );
connect( &m_filter1Model, SIGNAL( dataChanged() ), this, SLOT( changeControl() ) );
connect( &m_cut1Model, SIGNAL( dataChanged() ), this, SLOT( changeControl() ) );
connect( &m_res1Model, SIGNAL( dataChanged() ), this, SLOT( changeControl() ) );
connect( &m_gain1Model, SIGNAL( dataChanged() ), this, SLOT( changeControl() ) );
connect( &m_filter1Model, SIGNAL( dataChanged() ), this, SLOT( updateFilter1() ) );
connect( &m_cut1Model, SIGNAL( dataChanged() ), this, SLOT( updateFilter1() ) );
connect( &m_res1Model, SIGNAL( dataChanged() ), this, SLOT( updateFilter1() ) );
connect( &m_mixModel, SIGNAL( dataChanged() ), this, SLOT( changeControl() ) );
connect( &m_enabled2Model, SIGNAL( dataChanged() ), this, SLOT( changeControl() ) );
connect( &m_filter2Model, SIGNAL( dataChanged() ), this, SLOT( changeControl() ) );
connect( &m_cut2Model, SIGNAL( dataChanged() ), this, SLOT( changeControl() ) );
connect( &m_res2Model, SIGNAL( dataChanged() ), this, SLOT( changeControl() ) );
connect( &m_gain2Model, SIGNAL( dataChanged() ), this, SLOT( changeControl() ) );
connect( &m_filter2Model, SIGNAL( dataChanged() ), this, SLOT( updateFilter2() ) );
connect( &m_cut2Model, SIGNAL( dataChanged() ), this, SLOT( updateFilter2() ) );
connect( &m_res2Model, SIGNAL( dataChanged() ), this, SLOT( updateFilter2() ) );
m_filter1Model.addItem( tr( "LowPass" ), new PixmapLoader( "filter_lp" ) );
m_filter1Model.addItem( tr( "HiPass" ), new PixmapLoader( "filter_hp" ) );
@@ -102,19 +96,30 @@ DualFilterControls::DualFilterControls( DualFilterEffect* effect ) :
void DualFilterControls::changeControl()
void DualFilterControls::updateFilter1()
{
engine::getSong()->setModified();
m_effect->m_filter1changed = true;
}
void DualFilterControls::updateFilter2()
{
m_effect->m_filter2changed = true;
}
void DualFilterControls::updateFilters()
{
// swap filters to new ones
delete m_effect->m_filter1;
delete m_effect->m_filter2;
m_effect->m_filter1 = new basicFilters<2>( engine::mixer()->processingSampleRate() );
m_effect->m_filter2 = new basicFilters<2>( engine::mixer()->processingSampleRate() );
// flag filters as needing recalculation
updateFilter1();
updateFilter2();
}

3
plugins/DualFilter/DualFilterControls.h
View File

@@ -62,7 +62,8 @@ public:
private slots:
void changeControl();
void updateFilter1();
void updateFilter2();
void updateFilters();
private: